bug #33958 [DI] Add extra type check to php dumper (gquemener)

nicolas-grekas · nicolas-grekas · commit 831b00ff898d · 2019-10-12T11:12:58.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [DI] Add extra type check to php dumper | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #33942 | License | MIT | Doc PR This PR adds a missing type check in the PHP Dumper. The bug has been detected while working on the https://github.com/prooph/service-bus-symfony-bundle and I haven't been able to reproduce it within a minimalist testcase. I would like to add a unit test to cover it once I have figured out the exact context in which the bug occurs. Any help would be greatly appreciated to do so, especially from "senior" contributors of the DependencyInjection component, many thanks in advance! You will find more information about this bug in the linked ticket above. Commits ------- b17ebdf bug #33942 [DI] Add extra type check to php dumper
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1889,7 +1889,7 @@ private function isSingleUsePrivateNode(ServiceReferenceGraphNode $node): bool
             if (!$value = $edge->getSourceNode()->getValue()) {
                 continue;
             }
-            if ($edge->isLazy() || !$value->isShared()) {
+            if ($edge->isLazy() || !$value instanceof Definition || !$value->isShared()) {
                 return false;
             }
             $ids[$edge->getSourceNode()->getId()] = true;

Original file line number	Diff line number	Diff line change
`@@ -1889,7 +1889,7 @@ private function isSingleUsePrivateNode(ServiceReferenceGraphNode $node): bool`
`1889`	`1889`	`if (!$value = $edge->getSourceNode()->getValue()) {`
`1890`	`1890`	`continue;`
`1891`	`1891`	`}`
`1892`		`- if ($edge->isLazy() \|\| !$value->isShared()) {`
	`1892`	`+ if ($edge->isLazy() \|\| !$value instanceof Definition \|\| !$value->isShared()) {`
`1893`	`1893`	`return false;`
`1894`	`1894`	`}`
`1895`	`1895`	`$ids[$edge->getSourceNode()->getId()] = true;`