[DI] Clear service reference graph

nicolas-grekas · nicolas-grekas · commit bfb4c455804d · 2017-11-29T09:12:41.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
@@ -159,6 +159,8 @@ public function compile(ContainerBuilder $container)
             }
 
             throw $e;
+        } finally {
+            $this->getServiceReferenceGraph()->clear();
         }
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
@@ -75,6 +75,9 @@ public function getNodes()
      */
     public function clear()
     {
+        foreach ($this->nodes as $node) {
+            $node->clear();
+        }
         $this->nodes = array();
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
@@ -107,4 +107,12 @@ public function getValue()
     {
         return $this->value;
     }
+
+    /**
+     * Clears all edges.
+     */
+    public function clear()
+    {
+        $this->inEdges = $this->outEdges = array();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,8 @@ public function compile(ContainerBuilder $container)`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`throw $e;`
	`162`	`+ } finally {`
	`163`	`+ $this->getServiceReferenceGraph()->clear();`
`162`	`164`	`}`
`163`	`165`	`}`
`164`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,4 +107,12 @@ public function getValue()`
`107`	`107`	`{`
`108`	`108`	`return $this->value;`
`109`	`109`	`}`
	`110`	`+`
	`111`	`+ /**`
	`112`	`+ * Clears all edges.`
	`113`	`+ */`
	`114`	`+ public function clear()`
	`115`	`+ {`
	`116`	`+ $this->inEdges = $this->outEdges = array();`
	`117`	`+ }`
`110`	`118`	`}`