From 95dcfa2ee62d32b3553a8ce47b22b25aedefbffe Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Sat, 30 May 2015 22:40:00 +0200
Subject: [PATCH] [FrameworkBundle] make `templating.helper.router` service
 available again for BC reasons

---
 UPGRADE-3.0.md                                           | 9 +++++++++
 .../FrameworkBundle/Resources/config/templating.xml      | 8 +++++++-
 .../FrameworkBundle/Resources/config/templating_php.xml  | 6 ------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index f95d178ba75d..8c91a355a535 100644
--- a/UPGRADE-3.0.md
+++ b/UPGRADE-3.0.md
@@ -446,6 +446,15 @@ UPGRADE FROM 2.x to 3.0
 
  * The `RouterApacheDumperCommand` was removed.
 
+ * The `templating.helper.router` service was moved to `templating_php.xml`. You
+   have to ensure that the PHP templating engine is enabled to be able to use it:
+
+   ```yaml
+   framework:
+       templating:
+           engines: ['php']
+   ```
+
 ### HttpKernel
 
  * The `Symfony\Component\HttpKernel\Log\LoggerInterface` has been removed in
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
index 7b723227dadc..5aeb38e28422 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
@@ -15,6 +15,7 @@
         <parameter key="templating.loader.chain.class">Symfony\Component\Templating\Loader\ChainLoader</parameter>
         <parameter key="templating.finder.class">Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinder</parameter>
         <parameter key="templating.helper.assets.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper</parameter>
+        <parameter key="templating.helper.router.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\RouterHelper</parameter>
     </parameters>
 
     <services>
@@ -61,12 +62,17 @@
         <service id="templating.loader" alias="templating.loader.filesystem" />
 
         <!--
-            This service will be moved to templating_php.xml in version 3.0, it exists here for BC reasons.
+            The following services will be moved to templating_php.xml in version 3.0, they exist here for BC reasons.
         -->
         <service id="templating.helper.assets" class="%templating.helper.assets.class%">
             <tag name="templating.helper" alias="assets" />
             <argument /> <!-- default package -->
             <argument type="collection" /> <!-- named packages -->
         </service>
+
+        <service id="templating.helper.router" class="%templating.helper.router.class%">
+            <tag name="templating.helper" alias="router" />
+            <argument type="service" id="router" />
+        </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
index 5b4f8073feeb..ddcccc8df6bd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
@@ -8,7 +8,6 @@
         <parameter key="templating.engine.php.class">Symfony\Bundle\FrameworkBundle\Templating\PhpEngine</parameter>
         <parameter key="templating.helper.slots.class">Symfony\Component\Templating\Helper\SlotsHelper</parameter>
         <parameter key="templating.helper.actions.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\ActionsHelper</parameter>
-        <parameter key="templating.helper.router.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\RouterHelper</parameter>
         <parameter key="templating.helper.request.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\RequestHelper</parameter>
         <parameter key="templating.helper.session.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\SessionHelper</parameter>
         <parameter key="templating.helper.code.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\CodeHelper</parameter>
@@ -43,11 +42,6 @@
             <argument type="service" id="request_stack" />
         </service>
 
-        <service id="templating.helper.router" class="%templating.helper.router.class%">
-            <tag name="templating.helper" alias="router" />
-            <argument type="service" id="router" />
-        </service>
-
         <service id="templating.helper.actions" class="%templating.helper.actions.class%">
             <tag name="templating.helper" alias="actions" />
             <argument type="service" id="fragment.handler" />