Merge branch 'hotfix/71' into release-2.7

Close #71

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.7.4 - TBD
+## 2.7.4 - 2015-01-19
 
 ### Added
 
@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#71](https://github.com/zendframework/zend-servicemanager/pull/71) fixes an edge case
+  with alias usage, whereby an alias of an alias was not being resolved to the
+  final service name.
 
 ## 2.7.3 - 2016-01-13
 

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;

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