Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit 3fac676e0620 · 2018-12-02T16:58:55.000+01:00
* 3.4:
  [DI] dont inline when lazy edges are found
diff --git a/Compiler/InlineServiceDefinitionsPass.php b/Compiler/InlineServiceDefinitionsPass.php
@@ -98,7 +98,7 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe
             }
 
             foreach ($graph->getNode($id)->getInEdges() as $edge) {
-                if ($edge->isWeak()) {
+                if ($edge->isWeak() || $edge->isLazy()) {
                     return false;
                 }
             }
@@ -122,7 +122,7 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe
         $isReferencedByConstructor = false;
         foreach ($graph->getNode($id)->getInEdges() as $edge) {
             $isReferencedByConstructor = $isReferencedByConstructor || $edge->isReferencedByConstructor();
-            if ($edge->isWeak()) {
+            if ($edge->isWeak() || $edge->isLazy()) {
                 return false;
             }
             $ids[] = $edge->getSourceNode()->getId();

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`foreach ($graph->getNode($id)->getInEdges() as $edge) {`
`101`		`- if ($edge->isWeak()) {`
	`101`	`+ if ($edge->isWeak() \|\| $edge->isLazy()) {`
`102`	`102`	`return false;`
`103`	`103`	`}`
`104`	`104`	`}`
`@@ -122,7 +122,7 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe`
`122`	`122`	`$isReferencedByConstructor = false;`
`123`	`123`	`foreach ($graph->getNode($id)->getInEdges() as $edge) {`
`124`	`124`	`$isReferencedByConstructor = $isReferencedByConstructor \|\| $edge->isReferencedByConstructor();`
`125`		`- if ($edge->isWeak()) {`
	`125`	`+ if ($edge->isWeak() \|\| $edge->isLazy()) {`
`126`	`126`	`return false;`
`127`	`127`	`}`
`128`	`128`	`$ids[] = $edge->getSourceNode()->getId();`