8000 [TwigBundle] fixed usage when Templating is not installed · symfony/symfony@70f172b · GitHub
[go: up one dir, main page]
Skip to content

Commit 70f172b

Browse files
fabpotfabpot
committed
[TwigBundle] fixed usage when Templating is not installed
1 parent 23294e5 commit 70f172b

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,13 @@ public function process(ContainerBuilder $container)
8888
$container->getDefinition('twig.extension.debug')->addTag('twig.extension');
8989
}
9090

91-
if (!$container->has('templating')) {
92-
$loader = $container->getDefinition('twig.loader.native_filesystem');
93-
$loader->addTag('twig.loader');
94-
$loader->setMethodCalls($container->getDefinition('twig.loader.filesystem')->getMethodCalls());
91+
$twigLoader = $container->getDefinition('twig.loader.native_filesystem');
92+
if ($container->has('templating')) {
93+
$loader = $container->getDefinition('twig.loader.filesystem');
94+
$loader->setMethodCalls($twigLoader->getMethodCalls());
9595

96+
$twigLoader->clearTag('twig.loader');
97+
} else {
9698
$container->setAlias('twig.loader.filesystem', new Alias('twig.loader.native_filesystem', false));
9799
}
98100

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function load(array $configs, ContainerBuilder $container)
7777
$envConfiguratorDefinition->replaceArgument(4, $config['number_format']['decimal_point']);
7878
$envConfiguratorDefinition->replaceArgument(5, $config['number_format']['thousands_separator']);
7979

80-
$twigFilesystemLoaderDefinition = $container->getDefinition('twig.loader.filesystem');
80+
$twigFilesystemLoaderDefinition = $container->getDefinition('twig.loader.native_filesystem');
8181

8282
// register user-configured paths
8383
foreach ($config['paths'] as $path => $namespace) {

‎src/Symfony/Bundle/TwigBundle/Resources/config/templating.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
<tag name="twig.loader"/>
1111
</service>
1212

13-
<service id="twig.loader" alias="twig.loader.filesystem" />
14-
1513
<service id="templating.engine.twig" class="%templating.engine.twig.class%" public="false">
1614
<argument type="service" id="twig" />
1715
8386 <argument type="service" id="templating.name_parser" />

‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353

5454
<service id="twig.loader.native_filesystem" class="Twig_Loader_Filesystem" public="false">
5555
<argument type="collection" />
56+
<tag name="twig.loader"/>
5657
</service>
5758

5859
<service id="twig.loader.chain" class="%twig.loader.chain.class%" public="false"/>

0 commit comments

Comments
 (0)
0