fix merge

nicolas-grekas · nicolas-grekas · commit 719b4296555e · 2018-06-15T10:13:37.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -162,7 +162,9 @@ private function isInlineableDefinition($id, Definition $definition)
         }
 
         if (!$definition->isShared()) {
-            foreach ($graph->getNode($id)->getInEdges() as $edge) {
+            foreach ($this->graph->getNode($id)->getInEdges() as $edge) {
+                $srcId = $edge->getSourceNode()->getId();
+                $this->connectedIds[$srcId] = true;
                 if ($edge->isWeak()) {
                     return false;
                 }

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,9 @@ private function isInlineableDefinition($id, Definition $definition)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`if (!$definition->isShared()) {`
`165`		`- foreach ($graph->getNode($id)->getInEdges() as $edge) {`
	`165`	`+ foreach ($this->graph->getNode($id)->getInEdges() as $edge) {`
	`166`	`+ $srcId = $edge->getSourceNode()->getId();`
	`167`	`+ $this->connectedIds[$srcId] = true;`
`166`	`168`	`if ($edge->isWeak()) {`
`167`	`169`	`return false;`
`168`	`170`	`}`