minor #49623 [Translation] Decouple TranslatorPathsPass from "debug." convention (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 4f2313d1eb00 · 2023-03-06T21:04:36.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Translation] Decouple TranslatorPathsPass from "debug." convention | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Needed to make #49622 green. Commits ------- 0a12ee6 [Translation] Decouple TranslatorPathsPass from "debug." convention
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -122,7 +122,7 @@ public function process(ContainerBuilder $container)
 
                 $dispatcherDefinition = $globalDispatcherDefinition;
                 if (isset($event['dispatcher'])) {
-                    $dispatcherDefinition = $container->getDefinition($event['dispatcher']);
+                    $dispatcherDefinition = $container->findDefinition($event['dispatcher']);
                 }
 
                 $dispatcherDefinition->addMethodCall('addListener', [$event['event'], [new ServiceClosureArgument(new Reference($id)), $event['method']], $priority]);
@@ -161,7 +161,7 @@ public function process(ContainerBuilder $container)
                     continue;
                 }
 
-                $dispatcherDefinitions[$attributes['dispatcher']] = $container->getDefinition($attributes['dispatcher']);
+                $dispatcherDefinitions[$attributes['dispatcher']] = $container->findDefinition($attributes['dispatcher']);
             }
 
             if (!$dispatcherDefinitions) {
diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\TraceableValueResolver;
 
 /**
  * @author Yonel Ceruto <yonelceruto@gmail.com>
@@ -136,28 +137,20 @@ protected function processValue($value, bool $isRoot = false)
 
     private function findControllerArguments(ContainerBuilder $container): array
     {
-        if ($container->hasDefinition($this->resolverServiceId)) {
-            $argument = $container->getDefinition($this->resolverServiceId)->getArgument(0);
-            if ($argument instanceof Reference) {
-                $argument = $container->getDefinition($argument);
-            }
-
-            return $argument->getArgument(0);
+        if (!$container->has($this->resolverServiceId)) {
+            return [];
         }
+        $resolverDef = $container->findDefinition($this->resolverServiceId);
 
-        if ($container->hasDefinition('debug.'.$this->resolverServiceId)) {
-            $argument = $container->getDefinition('debug.'.$this->resolverServiceId)->getArgument(0);
-            if ($argument instanceof Reference) {
-                $argument = $container->getDefinition($argument);
-            }
-            $argument = $argument->getArgument(0);
-            if ($argument instanceof Reference) {
-                $argument = $container->getDefinition($argument);
-            }
+        if (TraceableValueResolver::class === $resolverDef->getClass()) {
+            $resolverDef = $container->getDefinition($resolverDef->getArgument(0));
+        }
 
-            return $argument->getArgument(0);
+        $argument = $resolverDef->getArgument(0);
+        if ($argument instanceof Reference) {
+            $argument = $container->getDefinition($argument);
         }
 
-        return [];
+        return $argument->getArgument(0);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public function process(ContainerBuilder $container)`
`122`	`122`
`123`	`123`	`$dispatcherDefinition = $globalDispatcherDefinition;`
`124`	`124`	`if (isset($event['dispatcher'])) {`
`125`		`- $dispatcherDefinition = $container->getDefinition($event['dispatcher']);`
	`125`	`+ $dispatcherDefinition = $container->findDefinition($event['dispatcher']);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`$dispatcherDefinition->addMethodCall('addListener', [$event['event'], [new ServiceClosureArgument(new Reference($id)), $event['method']], $priority]);`
`@@ -161,7 +161,7 @@ public function process(ContainerBuilder $container)`
`161`	`161`	`continue;`
`162`	`162`	`}`
`163`	`163`
`164`		`- $dispatcherDefinitions[$attributes['dispatcher']] = $container->getDefinition($attributes['dispatcher']);`
	`164`	`+ $dispatcherDefinitions[$attributes['dispatcher']] = $container->findDefinition($attributes['dispatcher']);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`if (!$dispatcherDefinitions) {`