Merge pull request #71 from scottaubrey/release-2.7

Broken use case using Alias of Alias
zendframework · Jan 19, 2016 · 962e268 · 962e268
2 parents c8d74ce + d01978a
commit 962e268
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -477,7 +477,7 @@ protected function resolveAlias($cName)
             }
 
             $stack[$cName] = $cName;
-            $cName = $this->aliases[$cName];
+            $cName = $this->aliases[$this->canonicalizeName($cName)];
         }
 
         return $cName;

diff --git a/test/ServiceManagerTest.php b/test/ServiceManagerTest.php
@@ -245,6 +245,17 @@ public function testGetWithAlias()
         $this->assertEquals('bar', $this->serviceManager->get('baz'));
     }
 
+    /**
+     * @covers Zend\ServiceManager\ServiceManager::get
+     */
+    public function testGetWithAliasofAliasWithCanonicalizedName()
+    {
+        $this->serviceManager->setService('Foo', 'Bar');
+        $this->serviceManager->setAlias('Baz', 'Foo');
+        $this->serviceManager->setAlias('Qux', 'Baz');
+        $this->assertEquals('Bar', $this->serviceManager->get('Qux'));
+    }
+
     /**
      * @covers Zend\ServiceManager\ServiceManager::get
      */