fix a DI circular reference recognition bug

tgabi333 · tgabi333 · commit 8a434edd2cfa · 2013-04-18T15:53:00.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
@@ -56,11 +56,13 @@ public function process(ContainerBuilder $container)
     private function checkOutEdges(array $edges)
     {
         foreach ($edges as $edge) {
-            $node = $edge->getDestNode();
-            $this->currentPath[] = $id = $node->getId();
+            $node      = $edge->getDestNode();
+            $id        = $node->getId();
+            $searchKey = array_search($id, $this->currentPath);
+            $this->currentPath[] = $id;
 
-            if ($this->currentId === $id) {
-                throw new ServiceCircularReferenceException($this->currentId, $this->currentPath);
+            if (false !== $searchKey) {
+                throw new ServiceCircularReferenceException($id, array_slice($this->currentPath, $searchKey));
             }
 
             $this->checkOutEdges($node->getOutEdges());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php
@@ -24,7 +24,7 @@
 class CheckCircularReferencesPassTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
      */
     public function testProcess()
     {
@@ -36,7 +36,7 @@ public function testProcess()
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
      */
     public function testProcessWithAliases()
     {
@@ -49,7 +49,7 @@ public function testProcessWithAliases()
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
      */
     public function testProcessDetectsIndirectCircularReference()
     {
@@ -61,6 +61,19 @@ public function testProcessDetectsIndirectCircularReference()
         $this->process($container);
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
+     */
+    public function testDeepCircularReference()
+    {
+        $container = new ContainerBuilder();
+        $container->register('a')->addArgument(new Reference('b'));
+        $container->register('b')->addArgument(new Reference('c'));
+        $container->register('c')->addArgument(new Reference('b'));
+
+        $this->process($container);
+    }
+
     public function testProcessIgnoresMethodCalls()
     {
         $container = new ContainerBuilder();

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`class CheckCircularReferencesPassTest extends \PHPUnit_Framework_TestCase`
`25`	`25`	`{`
`26`	`26`	`/**`
`27`		`- * @expectedException \RuntimeException`
	`27`	`+ * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException`
`28`	`28`	`*/`
`29`	`29`	`public function testProcess()`
`30`	`30`	`{`
`@@ -36,7 +36,7 @@ public function testProcess()`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`
`39`		`- * @expectedException \RuntimeException`
	`39`	`+ * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException`
`40`	`40`	`*/`
`41`	`41`	`public function testProcessWithAliases()`
`42`	`42`	`{`
`@@ -49,7 +49,7 @@ public function testProcessWithAliases()`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
`52`		`- * @expectedException \RuntimeException`
	`52`	`+ * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException`
`53`	`53`	`*/`
`54`	`54`	`public function testProcessDetectsIndirectCircularReference()`
`55`	`55`	`{`
`@@ -61,6 +61,19 @@ public function testProcessDetectsIndirectCircularReference()`
`61`	`61`	`$this->process($container);`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ /**`
	`65`	`+ * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException`
	`66`	`+ */`
	`67`	`+ public function testDeepCircularReference()`
	`68`	`+ {`
	`69`	`+ $container = new ContainerBuilder();`
	`70`	`+ $container->register('a')->addArgument(new Reference('b'));`
	`71`	`+ $container->register('b')->addArgument(new Reference('c'));`
	`72`	`+ $container->register('c')->addArgument(new Reference('b'));`
	`73`	`+`
	`74`	`+ $this->process($container);`
	`75`	`+ }`
	`76`	`+`
`64`	`77`	`public function testProcessIgnoresMethodCalls()`
`65`	`78`	`{`
`66`	`79`	`$container = new ContainerBuilder();`