Skip to content

Commit 317c200

Browse files
committed
Merge branch '3.4' into 4.0
* 3.4: [HttpKernel] Better handling of legacy cache modify definitions only if the do exist [DI] Prevent a ReflectionException during cache:clear when the parent class doesn't exist [FrameworkBundle] Make MicroKernelTraitTest green don't override existing verbosity env var [HttpKernel] Read $_ENV when checking SHELL_VERBOSITY Remove unreachable code Automatically enable the CSRF protection if CSRF manager exists bumped Symfony version to 3.4.0 adding checks for the expression language updated VERSION for 3.4.0-RC2 updated CHANGELOG for 3.4.0-RC2
2 parents 62c2022 + e05b0a5 commit 317c200

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

DependencyInjection/TranslatorPass.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,15 @@ public function process(ContainerBuilder $container)
6464
->replaceArgument(3, $loaders)
6565
;
6666

67-
if ($container->hasParameter('twig.default_path')) {
67+
if (!$container->hasParameter('twig.default_path')) {
68+
return;
69+
}
70+
71+
if ($container->hasDefinition($this->debugCommandServiceId)) {
6872
$container->getDefinition($this->debugCommandServiceId)->replaceArgument(4, $container->getParameter('twig.default_path'));
73+
}
74+
75+
if ($container->hasDefinition($this->updateCommandServiceId)) {
6976
$container->getDefinition($this->updateCommandServiceId)->replaceArgument(5, $container->getParameter('twig.default_path'));
7077
}
7178
}

0 commit comments

Comments
 (0)