diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2

Browse Source 
* 4.1:
  [DI] fix InlineServiceDefinitionsPass' fix
This commit is contained in:
Nicolas Grekas 2018-12-01 10:30:54 +01:00
commit cb57f87ad1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
View File

@ -164,11 +164,11 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass implements Repe
return false;
}
if (!$this->graph->hasNode($id)) {
return true;
}
if (!$definition->isShared()) {
if (!$this->graph->hasNode($id)) {
return true;
}
foreach ($this->graph->getNode($id)->getInEdges() as $edge) {
$srcId = $edge->getSourceNode()->getId();
$this->connectedIds[$srcId] = true;
@ -184,6 +184,10 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass implements Repe
return false;
}
if (!$this->graph->hasNode($id)) {
return true;
}
if ($this->currentId == $id) {
return false;
}