8000 Merge branch '3.1' into 3.2 · symfony/symfony@c34af41 · GitHub
[go: up one dir, main page]
Skip to content

Commit c34af41

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.1' into 3.2
* 3.1: Fix merge [TwigBundle][#20799] fix merge
2 parents 93a00b0 + 6fddb75 commit c34af41

File tree

4 files changed

+13
-39
lines changed

4 files changed

+13
-39
lines changed

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

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

1414
use Symfony\Component\DependencyInjection\ContainerBuilder;
1515
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
16+
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
1617

1718
/**
1819
* Registers Twig runtime services.

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

66
<services>
7-
<service id="twig.extension.form" class="%twig.extension.form.class%" public="false">
8-
<argument type="service" id="twig.form.renderer" />
7+
<service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
8+
<argument type="collection">
9+
<argument type="service" id="service_container" />
10+
<argument>twig.form.renderer</argument>
11+
</argument>
912
</service>
1013

11-
<service id="twig.form.engine" class="%twig.form.engine.class%" public="false">
14+
<service id="twig.form.engine" class="Symfony\Bridge\Twig\Form\TwigRendererEngine" public="false">
1215
<argument>%twig.form.resources%</argument>
16+
<argument type="service" id="twig" />
1317
</service>
1418

15-
<service id="twig.form.renderer" class="%twig.form.renderer.class%" public="false">
19+
<service id="twig.form.renderer" class="Symfony\Bridge\Twig\Form\TwigRenderer">
1620
<argument type="service" id="twig.form.engine" />
1721
<argument type="service" id="security.csrf.token_manager" on-invalid="null" />
22+
<tag name="twig.runtime" />
1823
</service>
1924
</services>
2025
</container>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

66
<services>
7-
<service id="twig.loader.filesystem" class="%twig.loader.filesystem.class%" public="false">
7+
<service id="twig.loader.filesystem" class="Symfony\Bundle\TwigBundle\Loader\FilesystemLoader" public="false">
88
<argument type="service" id="templating.locator" />
99
<argument type="service" id="templating.name_parser" />
10+
<argument /> <!-- project's root dir -->
1011
<tag name="twig.loader"/>
1112
</service>
1213

1314
<service id="twig.loader" alias="twig.loader.filesystem" />
1415

15-
<service id="templating.engine.twig" class="%templating.engine.twig.class%" public="false">
16+
<service id="templating.engine.twig" class="Symfony\Bundle\TwigBundle\TwigEngine" public="false">
1617
<argument type="service" id="twig" />
1718
<argument type="service" id="templating.name_parser" />
1819
<argument type="service" id="templating.locator" />

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

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,8 @@
4949
<argument /> <!-- project's root dir -->
5050
</service>
5151

52-
<service id="twig.loader.filesystem" class="Symfony\Bundle\TwigBundle\Loader\FilesystemLoader" public="false">
53-
<argument type="service" id="templating.locator" />
54-
<argument type="service" id="templating.name_parser" />
55-
<argument /> <!-- project's root dir -->
56-
<tag name="twig.loader"/>
57-
</service>
58-
5952
<service id="twig.loader.chain" class="Twig_Loader_Chain" public="false"/>
6053

61-
<service id="twig.loader" alias="twig.loader.filesystem" />
62-
63-
<service id="templating.engine.twig" class="Symfony\Bundle\TwigBundle\TwigEngine" public="false">
64-
<argument type="service" id="twig" />
65-
<argument type="service" id="templating.name_parser" />
66-
<argument type="service" id="templating.locator" />
67-
</service>
68-
6954
<service id="twig.extension.profiler" class="Symfony\Bridge\Twig\Extension\ProfilerExtension" public="false">
7055
<argument type="service" id="twig.profile" />
7156
<argument type="service" id="debug.stopwatch" on-invalid="null" />
@@ -118,26 +103,8 @@
118103
<argument type="service" id="router.request_context" on-invalid="ignore" />
119104
</service>
120105

121-
<service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
122-
<argument type="collection">
123-
<argument type="service" id="service_container" />
124-
<argument>twig.form.renderer</argument>
125-
</argument>
126-
</service>
127-
128106
<service id="twig.extension.debug" class="Twig_Extension_Debug" public="false" />
129107

130-
<service id="twig.form.engine" class="Symfony\Bridge\Twig\Form\TwigRendererEngine" public="false">
131-
<argument>%twig.form.resources%</argument>
132-
<argument type="service" id="twig" />
133-
</service>
134-
135-
<service id="twig.form.renderer" class="Symfony\Bridge\Twig\Form\TwigRenderer">
136-
<argument type="service" id="twig.form.engine" />
137-
<argument type="service" id="security.csrf.token_manager" on-invalid="null" />
138-
<tag name="twig.runtime" />
139-
</service>
140-
141108
<service id="twig.translation.extractor" class="Symfony\Bridge\Twig\Translation\TwigExtractor">
142109
<argument type="service" id="twig" />
143110
<tag name="translation.extractor" alias="twig" />

0 commit comments

Comments
 (0)
0