Merge branch '4.1' into 4.2

nicolas-grekas · nicolas-grekas · commit cfebe0c565e8 · 2018-12-02T16:59:36.000+01:00
* 4.1:
  [DI] dont inline when lazy edges are found
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -172,7 +172,7 @@ private function isInlineableDefinition($id, Definition $definition)
             foreach ($this->graph->getNode($id)->getInEdges() as $edge) {
                 $srcId = $edge->getSourceNode()->getId();
                 $this->connectedIds[$srcId] = true;
-                if ($edge->isWeak()) {
+                if ($edge->isWeak() || $edge->isLazy()) {
                     return false;
                 }
             }
@@ -200,7 +200,7 @@ private function isInlineableDefinition($id, Definition $definition)
             $isReferencedByConstructor = $isReferencedByConstructor || $edge->isReferencedByConstructor();
             $srcId = $edge->getSourceNode()->getId();
             $this->connectedIds[$srcId] = true;
-            if ($edge->isWeak()) {
+            if ($edge->isWeak() || $edge->isLazy()) {
                 return false;
             }
             $srcIds[$srcId] = true;

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ private function isInlineableDefinition($id, Definition $definition)`
`172`	`172`	`foreach ($this->graph->getNode($id)->getInEdges() as $edge) {`
`173`	`173`	`$srcId = $edge->getSourceNode()->getId();`
`174`	`174`	`$this->connectedIds[$srcId] = true;`
`175`		`- if ($edge->isWeak()) {`
	`175`	`+ if ($edge->isWeak() \|\| $edge->isLazy()) {`
`176`	`176`	`return false;`
`177`	`177`	`}`
`178`	`178`	`}`
`@@ -200,7 +200,7 @@ private function isInlineableDefinition($id, Definition $definition)`
`200`	`200`	`$isReferencedByConstructor = $isReferencedByConstructor \|\| $edge->isReferencedByConstructor();`
`201`	`201`	`$srcId = $edge->getSourceNode()->getId();`
`202`	`202`	`$this->connectedIds[$srcId] = true;`
`203`		`- if ($edge->isWeak()) {`
	`203`	`+ if ($edge->isWeak() \|\| $edge->isLazy()) {`
`204`	`204`	`return false;`
`205`	`205`	`}`
`206`	`206`	`$srcIds[$srcId] = true;`