Skip to content

Commit de39f18

Browse files
author
Douglas Greenshields
committed
add twig options to internal twig environment service by argument replacement
1 parent f0451d4 commit de39f18

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

DependencyInjection/Compiler/InternalTwigOptionsCompilerPass.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class InternalTwigOptionsCompilerPass implements CompilerPassInterface
1212
{
1313
public function process(ContainerBuilder $container)
1414
{
15-
//if we already have internal twig options we are making, return
16-
if ($container->hasParameter('markup_addressing.twig.options.internal')) {
15+
$internalTwigId = 'markup_addressing.twig.internal';
16+
if (!$container->hasDefinition($internalTwigId)) {
1717
return;
1818
}
1919

@@ -22,8 +22,9 @@ public function process(ContainerBuilder $container)
2222
return;
2323
}
2424

25+
$internalTwig = $container->getDefinition($internalTwigId);
2526
//make internal twig options using inherited twig options but with auto_reload env option set to true
2627
$twigOptions = $container->getParameter('twig.options');
27-
$container->setParameter('markup_addressing.twig.options.internal', array_merge($twigOptions, array('auto_reload' => true)));
28+
$internalTwig->replaceArgument(1, array_merge($twigOptions, ['auto_reload' => true]));
2829
}
2930
}

Resources/config/services.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ services:
6161
class: Twig_Environment
6262
arguments:
6363
- @markup_addressing.twig.loader
64-
- %markup_addressing.twig.options.internal%
64+
- []
6565
calls:
6666
- [ addExtension, [ @markup_addressing.country_name.extension ] ]
6767
scope: prototype

0 commit comments

Comments
 (0)