Merge branch 'hotfix/136' into develop

Forward port #136

Conflicts:
	CHANGELOG.md

Author: weierophinney

CHANGELOG.md

@@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 3.1.1 - TBD
+## 3.1.1 - 2016-07-15
 
 ### Added
 
@@ -36,7 +36,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#136](https://github.com/zendframework/zend-servicemanager/pull/136) removes
+  several imports to classes in subnamespaces within the `ServiceManager`
+  classfile, removing potential name resolution conflicts that occurred in edge
+  cases when testing.
 
 ## 3.1.0 - 2016-06-01
 

src/ServiceManager.php

@@ -22,9 +22,6 @@
 use Zend\ServiceManager\Exception\InvalidArgumentException;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\Factory\AbstractFactoryInterface;
-use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
-use Zend\ServiceManager\Initializer\InitializerInterface;
 
 /**
  * Service Manager.
@@ -44,7 +41,7 @@
 class ServiceManager implements ServiceLocatorInterface
 {
     /**
-     * @var AbstractFactoryInterface[]
+     * @var Factory\AbstractFactoryInterface[]
      */
     protected $abstractFactories = [];
 
@@ -70,7 +67,7 @@ class ServiceManager implements ServiceLocatorInterface
     protected $creationContext;
 
     /**
-     * @var string[][]|DelegatorFactoryInterface[][]
+     * @var string[][]|Factory\DelegatorFactoryInterface[][]
      */
     protected $delegators = [];
 
@@ -82,7 +79,7 @@ class ServiceManager implements ServiceLocatorInterface
     protected $factories = [];
 
     /**
-     * @var InitializerInterface[]
+     * @var Initializer\InitializerInterface[]
      */
     protected $initializers = [];
 
@@ -475,7 +472,7 @@ public function addDelegator($name, $factory)
     /**
      * Add an initializer.
      *
-     * @param string|callable|InitializerInterface $initializer
+     * @param string|callable|Initializer\InitializerInterface $initializer
      */
     public function addInitializer($initializer)
     {
@@ -507,7 +504,7 @@ public function setShared($name, $flag)
     /**
      * Instantiate abstract factories for to avoid checks during service construction.
      *
-     * @param string[]|AbstractFactoryInterface[] $abstractFactories
+     * @param string[]|Factory\AbstractFactoryInterface[] $abstractFactories
      *
      * @return void
      */
@@ -518,7 +515,7 @@ private function resolveAbstractFactories(array $abstractFactories)
                 $abstractFactory = new $abstractFactory();
             }
 
-            if ($abstractFactory instanceof AbstractFactoryInterface) {
+            if ($abstractFactory instanceof Factory\AbstractFactoryInterface) {
                 $this->abstractFactories[] = $abstractFactory;
                 continue;
             }
@@ -553,7 +550,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 +575,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 +586,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))
                 )
             );