Merge remote-tracking branch 'SpiffyJr/hotfix/sm-alias'

src/ServiceManager.php

@@ -264,6 +264,13 @@ public function get($name, $usePeeringServiceManagers = true)
             do {
                 $cName = $this->aliases[$cName];
             } while ($this->hasAlias($cName));
+
+            if (!$this->has($cName)) {
+                throw new Exception\ServiceNotFoundException(sprintf(
+                    'An alias "%s" was requested but no service could be found.',
+                    $name
+                ));
+            }
         }
 
         $instance = null;
@@ -477,10 +484,6 @@ public function setAlias($alias, $nameOrAlias)
             throw new Exception\InvalidServiceNameException('An alias by this name already exists');
         }
 
-        if (!$this->has($nameOrAlias)) {
-            throw new Exception\ServiceNotFoundException('A target service or target alias could not be located');
-        }
-
         $this->aliases[$alias] = $nameOrAlias;
         return $this;
     }

test/ServiceManagerTest.php

@@ -303,10 +303,30 @@ public function testSetAliasThrowsExceptionOnDuplicateAlias()
     /**
      * @covers Zend\ServiceManager\ServiceManager::setAlias
      */
-    public function testSetAliasThrowExceptionOnServiceNotFound()
+    public function testSetAliasDoesNotThrowExceptionOnServiceNotFound()
+    {
+        $this->serviceManager->setAlias('foo', 'bar');
+    }
+
+    /**
+     * @covers Zend\ServiceManager\ServiceManager::get
+     */
+    public function testGetServiceThrowsExceptionOnAliasWithNoSetService()
     {
         $this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
         $this->serviceManager->setAlias('foo', 'bar');
+        $this->serviceManager->get('foo');
+    }
+
+    /**
+     * @cover Zend\ServiceManager\ServiceManager::get
+     */
+    public function testGetServiceThrowsExceptionOnMultipleAliasesWithNoSetService()
+    {
+        $this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
+        $this->serviceManager->setAlias('foo', 'bar');
+        $this->serviceManager->setAlias('baz', 'foo');
+        $this->serviceManager->get('foo');
     }
 
     /**