[DI] fix edge case in InlineServiceDefinitionsPass

nicolas-grekas · nicolas-grekas · commit 8bd2bbfb1c86 · 2018-11-30T18:04:09.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -92,6 +92,10 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe
             return false;
         }
 
+        if (!$graph->hasNode($id)) {
+            return true;
+        }
+
         if (!$definition->isShared()) {
             foreach ($graph->getNode($id)->getInEdges() as $edge) {
                 if ($edge->isWeak()) {
@@ -106,10 +110,6 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe
             return false;
         }
 
-        if (!$graph->hasNode($id)) {
-            return true;
-        }
-
         if ($this->currentId == $id) {
             return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,10 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe`
`92`	`92`	`return false;`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ if (!$graph->hasNode($id)) {`
	`96`	`+ return true;`
	`97`	`+ }`
	`98`	`+`
`95`	`99`	`if (!$definition->isShared()) {`
`96`	`100`	`foreach ($graph->getNode($id)->getInEdges() as $edge) {`
`97`	`101`	`if ($edge->isWeak()) {`
`@@ -106,10 +110,6 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe`
`106`	`110`	`return false;`
`107`	`111`	`}`
`108`	`112`
`109`		`- if (!$graph->hasNode($id)) {`
`110`		`- return true;`
`111`		`- }`
`112`		`-`
`113`	`113`	`if ($this->currentId == $id) {`
`114`	`114`	`return false;`
`115`	`115`	`}`