Merge branch '4.2'
* 4.2: [DI] dont inline when lazy edges are found
This commit is contained in:
commit
974b98b17b
|
@ -172,7 +172,7 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass implements Repe
|
||||||
foreach ($this->graph->getNode($id)->getInEdges() as $edge) {
|
foreach ($this->graph->getNode($id)->getInEdges() as $edge) {
|
||||||
$srcId = $edge->getSourceNode()->getId();
|
$srcId = $edge->getSourceNode()->getId();
|
||||||
$this->connectedIds[$srcId] = true;
|
$this->connectedIds[$srcId] = true;
|
||||||
if ($edge->isWeak()) {
|
if ($edge->isWeak() || $edge->isLazy()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -200,7 +200,7 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass implements Repe
|
||||||
$isReferencedByConstructor = $isReferencedByConstructor || $edge->isReferencedByConstructor();
|
$isReferencedByConstructor = $isReferencedByConstructor || $edge->isReferencedByConstructor();
|
||||||
$srcId = $edge->getSourceNode()->getId();
|
$srcId = $edge->getSourceNode()->getId();
|
||||||
$this->connectedIds[$srcId] = true;
|
$this->connectedIds[$srcId] = true;
|
||||||
if ($edge->isWeak()) {
|
if ($edge->isWeak() || $edge->isLazy()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$srcIds[$srcId] = true;
|
$srcIds[$srcId] = true;
|
||||||
|
|
Reference in New Issue