From 315c07b46469f8191ae225c6f64237fe1dc516c6 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Thu, 22 May 2014 11:05:53 -0400
Subject: [PATCH] Cleaned up type hints conflicts in docblocks.
---
module/VuFind/src/VuFind/Db/Table/PluginManager.php | 8 ++++----
module/VuFind/src/VuFind/Recommend/PluginManager.php | 8 ++++----
module/VuFind/src/VuFind/RecordDriver/PluginManager.php | 8 ++++----
module/VuFind/src/VuFind/Related/PluginManager.php | 8 ++++----
module/VuFind/src/VuFind/Search/BackendManager.php | 2 +-
module/VuFind/src/VuFind/Search/Params/PluginManager.php | 8 ++++----
module/VuFind/src/VuFind/Search/Results/PluginManager.php | 8 ++++----
.../src/VuFind/ServiceManager/AbstractPluginManager.php | 8 ++++----
.../VuFind/src/VuFind/Statistics/Driver/PluginManager.php | 8 ++++----
module/VuFindHttp/src/VuFindHttp/HttpService.php | 6 +++---
module/VuFindHttp/src/VuFindHttp/HttpServiceInterface.php | 6 +++---
11 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/module/VuFind/src/VuFind/Db/Table/PluginManager.php b/module/VuFind/src/VuFind/Db/Table/PluginManager.php
index 057ce03e371..1def44ac819 100644
--- a/module/VuFind/src/VuFind/Db/Table/PluginManager.php
+++ b/module/VuFind/src/VuFind/Db/Table/PluginManager.php
@@ -26,6 +26,7 @@
* @link http://vufind.org/wiki/vufind2:database_gateways Wiki
*/
namespace VuFind\Db\Table;
+use Zend\ServiceManager\ConfigInterface;
/**
* Database table plugin manager
@@ -43,11 +44,10 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
*
* Make sure table gateways are properly initialized.
*
- * @param null|ConfigInterface $configuration Configuration settings (optional)
+ * @param ConfigInterface $configuration Configuration settings (optional)
*/
- public function __construct(
- \Zend\ServiceManager\ConfigInterface $configuration = null
- ) {
+ public function __construct(ConfigInterface $configuration = null)
+ {
parent::__construct($configuration);
$initializer = function ($instance, $manager) {
$instance
diff --git a/module/VuFind/src/VuFind/Recommend/PluginManager.php b/module/VuFind/src/VuFind/Recommend/PluginManager.php
index d537edb793d..cd14b1fbf0e 100644
--- a/module/VuFind/src/VuFind/Recommend/PluginManager.php
+++ b/module/VuFind/src/VuFind/Recommend/PluginManager.php
@@ -26,6 +26,7 @@
* @link http://vufind.org/wiki/vufind2:recommendation_modules Wiki
*/
namespace VuFind\Recommend;
+use Zend\ServiceManager\ConfigInterface;
/**
* Recommendation module plugin manager
@@ -41,11 +42,10 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
/**
* Constructor
*
- * @param null|ConfigInterface $configuration Configuration settings (optional)
+ * @param ConfigInterface $configuration Configuration settings (optional)
*/
- public function __construct(
- \Zend\ServiceManager\ConfigInterface $configuration = null
- ) {
+ public function __construct(ConfigInterface $configuration = null)
+ {
// These plugins are not meant to be shared -- the same module may be used
// multiple times with different configurations, so we need to build a new
// copy each time the plugin is retrieved.
diff --git a/module/VuFind/src/VuFind/RecordDriver/PluginManager.php b/module/VuFind/src/VuFind/RecordDriver/PluginManager.php
index 17bc972f37d..407e0284bf2 100644
--- a/module/VuFind/src/VuFind/RecordDriver/PluginManager.php
+++ b/module/VuFind/src/VuFind/RecordDriver/PluginManager.php
@@ -26,6 +26,7 @@
* @link http://vufind.org/wiki/vufind2:record_drivers Wiki
*/
namespace VuFind\RecordDriver;
+use Zend\ServiceManager\ConfigInterface;
/**
* Record driver plugin manager
@@ -41,11 +42,10 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
/**
* Constructor
*
- * @param null|ConfigInterface $configuration Configuration settings (optional)
+ * @param ConfigInterface $configuration Configuration settings (optional)
*/
- public function __construct(
- \Zend\ServiceManager\ConfigInterface $configuration = null
- ) {
+ public function __construct(ConfigInterface $configuration = null)
+ {
// Record drivers are not meant to be shared -- every time we retrieve one,
// we are building a brand new object.
$this->setShareByDefault(false);
diff --git a/module/VuFind/src/VuFind/Related/PluginManager.php b/module/VuFind/src/VuFind/Related/PluginManager.php
index af1d827f7ad..168adc75783 100644
--- a/module/VuFind/src/VuFind/Related/PluginManager.php
+++ b/module/VuFind/src/VuFind/Related/PluginManager.php
@@ -26,6 +26,7 @@
* @link http://vufind.org/wiki/vufind2:building_a_related_record_module Wiki
*/
namespace VuFind\Related;
+use Zend\ServiceManager\ConfigInterface;
/**
* Related record plugin manager
@@ -41,11 +42,10 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
/**
* Constructor
*
- * @param null|ConfigInterface $configuration Configuration settings (optional)
+ * @param ConfigInterface $configuration Configuration settings (optional)
*/
- public function __construct(
- \Zend\ServiceManager\ConfigInterface $configuration = null
- ) {
+ public function __construct(ConfigInterface $configuration = null)
+ {
// These plugins are not meant to be shared -- the same module may be used
// multiple times with different configurations, so we need to build a new
// copy each time the plugin is retrieved.
diff --git a/module/VuFind/src/VuFind/Search/BackendManager.php b/module/VuFind/src/VuFind/Search/BackendManager.php
index 45eb5690f93..16364ff1071 100644
--- a/module/VuFind/src/VuFind/Search/BackendManager.php
+++ b/module/VuFind/src/VuFind/Search/BackendManager.php
@@ -68,7 +68,7 @@ class BackendManager implements SharedListenerAggregateInterface
/**
* Constructor.
*
- * @param ServiceManager $registry Backend registry
+ * @param ServiceLocatorInterface $registry Backend registry
*
* @return void
*/
diff --git a/module/VuFind/src/VuFind/Search/Params/PluginManager.php b/module/VuFind/src/VuFind/Search/Params/PluginManager.php
index baaa27cca4b..2bb6cdb56ba 100644
--- a/module/VuFind/src/VuFind/Search/Params/PluginManager.php
+++ b/module/VuFind/src/VuFind/Search/Params/PluginManager.php
@@ -26,6 +26,7 @@
* @link http://vufind.org/wiki/vufind2:record_drivers Wiki
*/
namespace VuFind\Search\Params;
+use Zend\ServiceManager\ConfigInterface;
/**
* Search params plugin manager
@@ -41,11 +42,10 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
/**
* Constructor
*
- * @param null|ConfigInterface $configuration Configuration settings (optional)
+ * @param ConfigInterface $configuration Configuration settings (optional)
*/
- public function __construct(
- \Zend\ServiceManager\ConfigInterface $configuration = null
- ) {
+ public function __construct(ConfigInterface $configuration = null)
+ {
// These objects are not meant to be shared -- every time we retrieve one,
// we are building a brand new object.
$this->setShareByDefault(false);
diff --git a/module/VuFind/src/VuFind/Search/Results/PluginManager.php b/module/VuFind/src/VuFind/Search/Results/PluginManager.php
index 720e6bdae8f..15cfd57680f 100644
--- a/module/VuFind/src/VuFind/Search/Results/PluginManager.php
+++ b/module/VuFind/src/VuFind/Search/Results/PluginManager.php
@@ -26,6 +26,7 @@
* @link http://vufind.org/wiki/vufind2:record_drivers Wiki
*/
namespace VuFind\Search\Results;
+use Zend\ServiceManager\ConfigInterface;
/**
* Search results plugin manager
@@ -41,11 +42,10 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
/**
* Constructor
*
- * @param null|ConfigInterface $configuration Configuration settings (optional)
+ * @param ConfigInterface $configuration Configuration settings (optional)
*/
- public function __construct(
- \Zend\ServiceManager\ConfigInterface $configuration = null
- ) {
+ public function __construct(ConfigInterface $configuration = null)
+ {
// These objects are not meant to be shared -- every time we retrieve one,
// we are building a brand new object.
$this->setShareByDefault(false);
diff --git a/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php b/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php
index f9721dac18a..3fdda41e3d7 100644
--- a/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php
+++ b/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php
@@ -27,6 +27,7 @@
*/
namespace VuFind\ServiceManager;
use Zend\ServiceManager\AbstractPluginManager as Base,
+ Zend\ServiceManager\ConfigInterface,
Zend\ServiceManager\Exception\RuntimeException as ServiceManagerRuntimeException;
/**
@@ -46,11 +47,10 @@ abstract class AbstractPluginManager extends Base
*
* Make sure table gateways are properly initialized.
*
- * @param null|ConfigInterface $configuration Configuration settings (optional)
+ * @param ConfigInterface $configuration Configuration settings (optional)
*/
- public function __construct(
- \Zend\ServiceManager\ConfigInterface $configuration = null
- ) {
+ public function __construct(ConfigInterface $configuration = null)
+ {
parent::__construct($configuration);
$this->addInitializer(
array('VuFind\ServiceManager\Initializer', 'initPlugin'), false
diff --git a/module/VuFind/src/VuFind/Statistics/Driver/PluginManager.php b/module/VuFind/src/VuFind/Statistics/Driver/PluginManager.php
index 9f3590029ef..6f78dc32556 100644
--- a/module/VuFind/src/VuFind/Statistics/Driver/PluginManager.php
+++ b/module/VuFind/src/VuFind/Statistics/Driver/PluginManager.php
@@ -26,6 +26,7 @@
* @link http://vufind.org/wiki/vufind2:statistics_drivers Wiki
*/
namespace VuFind\Statistics\Driver;
+use Zend\ServiceManager\ConfigInterface;
/**
* Statistics driver plugin manager
@@ -41,11 +42,10 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
/**
* Constructor
*
- * @param null|ConfigInterface $configuration Configuration settings (optional)
+ * @param ConfigInterface $configuration Configuration settings (optional)
*/
- public function __construct(
- \Zend\ServiceManager\ConfigInterface $configuration = null
- ) {
+ public function __construct(ConfigInterface $configuration = null)
+ {
// Stats drivers are not meant to be shared -- every time we retrieve one,
// we are building a brand new object.
$this->setShareByDefault(false);
diff --git a/module/VuFindHttp/src/VuFindHttp/HttpService.php b/module/VuFindHttp/src/VuFindHttp/HttpService.php
index b3f029fd797..553c023125f 100644
--- a/module/VuFindHttp/src/VuFindHttp/HttpService.php
+++ b/module/VuFindHttp/src/VuFindHttp/HttpService.php
@@ -90,10 +90,10 @@ class HttpService implements HttpServiceInterface
*
* Returns the client given as argument with appropriate proxy setup.
*
- * @param Zend\Http\Client $client HTTP client
- * @param array $options ZF2 ProxyAdapter options
+ * @param \Zend\Http\Client $client HTTP client
+ * @param array $options ZF2 ProxyAdapter options
*
- * @return Zend\Http\Client
+ * @return \Zend\Http\Client
*/
public function proxify(\Zend\Http\Client $client, array $options = array())
{
diff --git a/module/VuFindHttp/src/VuFindHttp/HttpServiceInterface.php b/module/VuFindHttp/src/VuFindHttp/HttpServiceInterface.php
index 3a16da3fe1c..d23f84044d1 100644
--- a/module/VuFindHttp/src/VuFindHttp/HttpServiceInterface.php
+++ b/module/VuFindHttp/src/VuFindHttp/HttpServiceInterface.php
@@ -46,10 +46,10 @@ interface HttpServiceInterface
*
* Returns the client given as argument with appropriate proxy setup.
*
- * @param Zend\Http\Client $client HTTP client
- * @param array $options ZF2 ProxyAdapter options
+ * @param \Zend\Http\Client $client HTTP client
+ * @param array $options ZF2 ProxyAdapter options
*
- * @return Zend\Http\Client
+ * @return \Zend\Http\Client
*/
public function proxify(\Zend\Http\Client $client, array $options = array());
--
GitLab