Skip to content

Commit 4f02b8a

Browse files
Merge branch '4.1' into 4.2
* 4.1: fix cs [Validator] Allow `ConstraintViolation::__toString()` to expose codes that are not null or emtpy strings fix type for $value in DocBlock [WebProfilerBundle] Fix title case Fix wrapped loop of event listener [DI] fix edge case in InlineServiceDefinitionsPass undeprecate the single-colon notation for controllers Update HttpKernel.php
2 parents 0f6d460 + ce242b9 commit 4f02b8a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Compiler/InlineServiceDefinitionsPass.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@ private function isInlineableDefinition($id, Definition $definition)
164164
return false;
165165
}
166166

167+
if (!$this->graph->hasNode($id)) {
168+
return true;
169+
}
170+
167171
if (!$definition->isShared()) {
168172
foreach ($this->graph->getNode($id)->getInEdges() as $edge) {
169173
$srcId = $edge->getSourceNode()->getId();
@@ -180,10 +184,6 @@ private function isInlineableDefinition($id, Definition $definition)
180184
return false;
181185
}
182186

183-
if (!$this->graph->hasNode($id)) {
184-
return true;
185-
}
186-
187187
if ($this->currentId == $id) {
188188
return false;
189189
}

0 commit comments

Comments
 (0)