8000 minor #20992 [TwigBundle][#20799] fix merge (xabbuh) · symfony/symfony@be71023 · GitHub
[go: up one dir, main page]
Skip to content

Commit be71023

Browse files
nicolas-grekasnicolas-grekas
committed
minor #20992 [TwigBundle][#20799] fix merge (xabbuh)
This PR was merged into the 3.1 branch. Discussion ---------- [TwigBundle][#20799] fix merge | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 98c835d [TwigBundle][#20799] fix merge
2 parents e618ff3 + 98c835d commit be71023

File tree

3 files changed

+5
-30
lines changed

3 files changed

+5
-30
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
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">
7+
<service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
88
<argument type="service" id="twig.form.renderer" />
99
</service>
1010

11-
<service id="twig.form.engine" class="%twig.form.engine.class%" public="false">
11+
<service id="twig.form.engine" class="Symfony\Bridge\Twig\Form\TwigRendererEngine" public="false">
1212
<argument>%twig.form.resources%</argument>
1313
</service>
1414

15-
<service id="twig.form.renderer" class="%twig.form.renderer.class%" public="false">
15+
<service id="twig.form.renderer" class="Symfony\Bridge\Twig\Form\TwigRenderer" public="false">
1616
<argument type="service" id="twig.form.engine" />
1717
<argument type="service" id="security.csrf.token_manager" on-invalid="null" />
1818
</service>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
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" />
1010
<tag name="twig.loader"/>
1111
</service>
1212

1313
<service id="twig.loader" alias="twig.loader.filesystem" />
1414

15-
<service id="templating.engine.twig" class="%templating.engine.twig.class%" public="false">
15+
<service id="templating.engine.twig" class="Symfony\Bundle\TwigBundle\TwigEngine" public="false">
1616
<argument type="service" id="twig" />
1717
<argument type="service" id="templating.name_parser" />
1818
<argument type="service" id="templating.locator" />

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,10 @@
4545
<argument type="collection" />
4646
</service>
4747

48-
<service id="twig.loader.filesystem" class="Symfony\Bundle\TwigBundle\Loader\FilesystemLoader" public="false">
49-
<argument type="service" id="templating.locator" />
50-
<argument type="service" id="templating.name_parser" />
51-
<tag name="twig.loader"/>
52-
</service>
53-
5448
<service id="twig.loader.chain" class="Twig_Loader_Chain" public="false"/>
5549

5650
<service id="twig.loader" alias="twig.loader.filesystem" />
5751

58-
<service id="templating.engine.twig" class="Symfony\Bundle\TwigBundle\TwigEngine" public="false">
59-
<argument type="service" id="twig" />
60-
<argument type="service" id="templating.name_parser" />
61-
<argument type="service" id="templating.locator" />
62-
</service>
63-
6452
<service id="twig.extension.profiler" class="Symfony\Bridge\Twig\Extension\ProfilerExtension" public="false">
6553
<argument type="service" id="twig.profile" />
6654
<argument type="service" id="debug.stopwatch" on-invalid="null" />
@@ -115,21 +103,8 @@
115103
<argument type="service" id="router.request_context" on-invalid="ignore" />
116104
</service>
117105

118-
<service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
119-
<argument type="service" id="twig.form.renderer" />
120-
</service>
121-
122106
<service id="twig.extension.debug" class="Twig_Extension_Debug" public="false" />
123107

124-
<service id="twig.form.engine" class="Symfony\Bridge\Twig\Form\TwigRendererEngine" public="false">
125-
<argument>%twig.form.resources%</argument>
126-
</service>
127-
128-
<service id="twig.form.renderer" class="Symfony\Bridge\Twig\Form\TwigRenderer" public="false">
129-
<argument type="service" id="twig.form.engine" />
130-
<argument type="service" id="security.csrf.token_manager" on-invalid="null" />
131-
</service>
132-
133108
<service id="twig.translation.extractor" class="Symfony\Bridge\Twig\Translation\TwigExtractor">
134109
<argument type="service" id="twig" />
135110
<tag name="translation.extractor" alias="twig" />

0 commit comments

Comments
 (0)
0