[DI] Fix circular reference when using setters

nicolas-grekas · nicolas-grekas · commit be5bff372835 · 2017-11-27T21:00:44.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -353,22 +353,18 @@ private function analyzeCircularReferences(array $edges, &$checkedNodes, &$curre
             $node = $edge->getDestNode();
             $id = $node->getId();
 
-            if (isset($checkedNodes[$id])) {
-                continue;
-            }
-            $checkedNodes[$id] = true;
-
             if ($node->getValue() && ($edge->isLazy() || $edge->isWeak())) {
                 // no-op
             } elseif (isset($currentPath[$id])) {
                 foreach (array_reverse($currentPath) as $parentId) {
                     $this->circularReferences[$parentId][$id] = $id;
                     $id = $parentId;
                 }
-            } else {
+            } elseif (!isset($checkedNodes[$id])) {
+                $checkedNodes[$id] = true;
                 $currentPath[$id] = $id;
                 $this->analyzeCircularReferences($node->getOutEdges(), $checkedNodes, $currentPath);
-                array_pop($currentPath);
+                unset($currentPath[$id]);
             }
         }
     }
