bug #25174 [Translation] modify definitions only if the do exist (xabbuh)

fabpot · fabpot · commit 3c8ff5ea834b · 2017-11-27T14:17:52.000-08:00
This PR was merged into the 3.4 branch. Discussion ---------- [Translation] modify definitions only if the do exist | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | If the `TranslatorPass` is used an application without the Console component, the commands will not be registered. Thus, their service definitions must not be modified. Commits ------- eab90ef modify definitions only if the do exist
diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
@@ -80,8 +80,15 @@ public function process(ContainerBuilder $container)
             ->replaceArgument(3, $loaders)
         ;
 
-        if ($container->hasParameter('twig.default_path')) {
+        if (!$container->hasParameter('twig.default_path')) {
+            return;
+        }
+
+        if ($container->hasDefinition($this->debugCommandServiceId)) {
             $container->getDefinition($this->debugCommandServiceId)->replaceArgument(4, $container->getParameter('twig.default_path'));
+        }
+
+        if ($container->hasDefinition($this->updateCommandServiceId)) {
             $container->getDefinition($this->updateCommandServiceId)->replaceArgument(5, $container->getParameter('twig.default_path'));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,15 @@ public function process(ContainerBuilder $container)`
`80`	`80`	`->replaceArgument(3, $loaders)`
`81`	`81`	`;`
`82`	`82`
`83`		`- if ($container->hasParameter('twig.default_path')) {`
	`83`	`+ if (!$container->hasParameter('twig.default_path')) {`
	`84`	`+ return;`
	`85`	`+ }`
	`86`	`+`
	`87`	`+ if ($container->hasDefinition($this->debugCommandServiceId)) {`
`84`	`88`	`$container->getDefinition($this->debugCommandServiceId)->replaceArgument(4, $container->getParameter('twig.default_path'));`
	`89`	`+ }`
	`90`	`+`
	`91`	`+ if ($container->hasDefinition($this->updateCommandServiceId)) {`
`85`	`92`	`$container->getDefinition($this->updateCommandServiceId)->replaceArgument(5, $container->getParameter('twig.default_path'));`
`86`	`93`	`}`
`87`	`94`	`}`