#83 - a specific exception should be thrown when a cycle is detected

Author: Ocramius

src/ServiceManager.php

@@ -16,6 +16,7 @@
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
 use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy;
 use Zend\ServiceManager\Exception\ContainerModificationsNotAllowedException;
+use Zend\ServiceManager\Exception\CyclicAliasException;
 use Zend\ServiceManager\Exception\InvalidArgumentException;
 use Zend\ServiceManager\Exception\InvalidServiceException;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
@@ -575,7 +576,7 @@ private function resolveAliases(array $aliases)
 
             while (isset($this->aliases[$name])) {
                 if (isset($visited[$name])) {
-                    throw new InvalidServiceException('YADDA');
+                    throw CyclicAliasException::fromAliasesMap($aliases);
                 }
 
                 $visited[$name] = true;

test/CommonServiceLocatorBehaviorsTrait.php

@@ -15,6 +15,7 @@
 use ReflectionProperty;
 use stdClass;
 use Zend\ServiceManager\Exception\ContainerModificationsNotAllowedException;
+use Zend\ServiceManager\Exception\CyclicAliasException;
 use Zend\ServiceManager\Exception\InvalidArgumentException;
 use Zend\ServiceManager\Exception\InvalidServiceException;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
@@ -791,15 +792,13 @@ public function testCanRetrieveParentContainerViaGetServiceLocatorWithDeprecatio
      */
     public function testCrashesOnCyclicAliases()
     {
-        $this->setExpectedException(InvalidServiceException::class);
+        $this->setExpectedException(CyclicAliasException::class);
 
-        $serviceManager = $this->createContainer([
+        $this->createContainer([
             'aliases' => [
                 'a' => 'b',
                 'b' => 'a',
             ],
         ]);
-
-        $serviceManager->get('b');
     }
 }