Cleaned up type hints conflicts in docblocks.

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

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.

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);

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.

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
      */

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);

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);

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

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);

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())
     {

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());