Merge pull request #136 from kokspflanze/bugfix/already_in_use

InitializerInterface already in use

Author: weierophinney

src/ServiceManager.php

@@ -24,7 +24,7 @@
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\ServiceManager\Factory\AbstractFactoryInterface;
 use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
-use Zend\ServiceManager\Initializer\InitializerInterface;
+use Zend\ServiceManager\Initializer;
 
 /**
  * Service Manager.
@@ -82,7 +82,7 @@ class ServiceManager implements ServiceLocatorInterface
     protected $factories = [];
 
     /**
-     * @var InitializerInterface[]
+     * @var Initializer\InitializerInterface[]
      */
     protected $initializers = [];
 
@@ -475,7 +475,7 @@ public function addDelegator($name, $factory)
     /**
      * Add an initializer.
      *
-     * @param string|callable|InitializerInterface $initializer
+     * @param string|callable|Initializer\InitializerInterface $initializer
      */
     public function addInitializer($initializer)
     {
@@ -553,7 +553,7 @@ private function resolveAbstractFactories(array $abstractFactories)
     /**
      * Instantiate initializers for to avoid checks during service construction.
      *
-     * @param string[]|callable[]|InitializerInterface[] $initializers
+     * @param string[]|callable[]|Initializer\InitializerInterface[] $initializers
      *
      * @return void
      */
@@ -578,7 +578,7 @@ private function resolveInitializers(array $initializers)
                         'which does not exist; please provide a valid function name or class ' .
                         'name resolving to an implementation of %s',
                         $initializer,
-                        InitializerInterface::class
+                        Initializer\InitializerInterface::class
                     )
                 );
             }
@@ -589,7 +589,7 @@ private function resolveInitializers(array $initializers)
                     'An invalid initializer was registered. Expected a callable, or an instance of ' .
                     '(or string class name resolving to) "%s", ' .
                     'but "%s" was received',
-                    InitializerInterface::class,
+                    Initializer\InitializerInterface::class,
                     (is_object($initializer) ? get_class($initializer) : gettype($initializer))
                 )
             );