Merge branch '3.4' into 4.1
* 3.4: [DI] dont inline when lazy edges are found
This commit is contained in:
commit
a256c6914d
@ -98,7 +98,7 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass implements Repe
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach ($graph->getNode($id)->getInEdges() as $edge) {
|
foreach ($graph->getNode($id)->getInEdges() as $edge) {
|
||||||
if ($edge->isWeak()) {
|
if ($edge->isWeak() || $edge->isLazy()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -122,7 +122,7 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass implements Repe
|
|||||||
$isReferencedByConstructor = false;
|
$isReferencedByConstructor = false;
|
||||||
foreach ($graph->getNode($id)->getInEdges() as $edge) {
|
foreach ($graph->getNode($id)->getInEdges() as $edge) {
|
||||||
$isReferencedByConstructor = $isReferencedByConstructor || $edge->isReferencedByConstructor();
|
$isReferencedByConstructor = $isReferencedByConstructor || $edge->isReferencedByConstructor();
|
||||||
if ($edge->isWeak()) {
|
if ($edge->isWeak() || $edge->isLazy()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$ids[] = $edge->getSourceNode()->getId();
|
$ids[] = $edge->getSourceNode()->getId();
|
||||||
|
Reference in New Issue
Block a user