[FrameworkBundle] removed request service occurrences.

Hugo Hamon · Hugo Hamon · commit 6fa6e98c8a10 · 2014-11-12T00:39:57.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -261,20 +261,6 @@ public function createFormBuilder($data = null, array $options = array())
         return $this->container->get('form.factory')->createBuilder('form', $data, $options);
     }
 
-    /**
-     * Shortcut to return the request service.
-     *
-     * @return Request
-     *
-     * @deprecated Deprecated since version 2.4, to be removed in 3.0. Ask
-     *             Symfony to inject the Request object into your controller
-     *             method instead by type hinting it in the method's signature.
-     */
-    public function getRequest()
-    {
-        return $this->container->get('request_stack')->getCurrentRequest();
-    }
-
     /**
      * Shortcut to return the Doctrine Registry service.
      *
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -37,22 +37,11 @@
             <argument type="collection" />
         </service>
 
-        <!--
-            If you want to change the Request class, modify the code in
-            your front controller (app.php) so that it passes an instance of
-            YourRequestClass to the Kernel.
-            This service definition only defines the scope of the request.
-            It is used to check references scope.
-
-            This service is deprecated, you should use the request_stack service instead.
-        -->
-        <service id="request" scope="request" synthetic="true" synchronized="true" />
-
         <service id="service_container" synthetic="true" />
 
         <service id="kernel" synthetic="true" />
 
-        <service id="filesystem" class="%filesystem.class%"></service>
+        <service id="filesystem" class="%filesystem.class%"/>
 
         <service id="file_locator" class="%file_locator.class%">
             <argument type="service" id="kernel" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
@@ -44,7 +44,7 @@
         </service>
 
         <service id="templating.asset.path_package" class="%templating.asset.path_package.class%" abstract="true">
-            <argument type="service" id="request" />
+            <argument type="expression">service('request_stack').getCurrentRequest()</argument>
             <argument /> <!-- version -->
             <argument /> <!-- version format -->
         </service>
@@ -56,7 +56,7 @@
         </service>
 
         <service id="templating.asset.request_aware_package" class="Symfony\Component\Templating\Asset\PackageInterface" factory-service="templating.asset.package_factory" factory-method="getPackage" abstract="true">
-            <argument type="service" id="request" strict="false" />
+            <argument type="expression" strict="false">service('request_stack').getCurrentRequest()</argument>
             <argument /> <!-- HTTP id -->
             <argument /> <!-- SSL id -->
         </service>
