Fix class resolution in Doctrine EventListenerPass

jderusse · jderusse · commit 08b2da79e851 · 2021-01-27T01:01:34.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -85,7 +85,7 @@ private function addTaggedSubscribers(ContainerBuilder $container, array &$liste
 
                 if (!isset($managerDefs[$con])) {
                     $managerDef = $parentDef = $this->getEventManagerDef($container, $con);
-                    while ($parentDef instanceof ChildDefinition) {
+                    while (!$parentDef->getClass() && $parentDef instanceof ChildDefinition) {
                         $parentDef = $container->findDefinition($parentDef->getParent());
                     }
                     $managerClass = $container->getParameterBag()->resolveValue($parentDef->getClass());

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ private function addTaggedSubscribers(ContainerBuilder $container, array &$liste`
`85`	`85`
`86`	`86`	`if (!isset($managerDefs[$con])) {`
`87`	`87`	`$managerDef = $parentDef = $this->getEventManagerDef($container, $con);`
`88`		`- while ($parentDef instanceof ChildDefinition) {`
	`88`	`+ while (!$parentDef->getClass() && $parentDef instanceof ChildDefinition) {`
`89`	`89`	`$parentDef = $container->findDefinition($parentDef->getParent());`
`90`	`90`	`}`
`91`	`91`	`$managerClass = $container->getParameterBag()->resolveValue($parentDef->getClass());`