moved RequestStack to HttpFoundation and removed RequestContext

Author: fabpot

Resources/config/fragment_renderer.xml

@@ -17,7 +17,7 @@
         <service id="fragment.handler" class="%fragment.handler.class%">
             <argument type="collection" />
             <argument>%kernel.debug%</argument>
-            <argument type="service" id="request_context" />
+            <argument type="service" id="request_stack" />
         </service>
 
         <service id="fragment.renderer.inline" class="%fragment.renderer.inline.class%">

Resources/config/routing.xml

@@ -94,7 +94,7 @@
             <argument type="service" id="router" />
             <argument type="service" id="router.request_context" on-invalid="ignore" />
             <argument type="service" id="logger" on-invalid="ignore" />
-            <argument type="service" id="request_context" />
+            <argument type="service" id="request_stack" />
         </service>
     </services>
 </container>

Resources/config/services.xml

@@ -12,8 +12,7 @@
         <parameter key="cache_clearer.class">Symfony\Component\HttpKernel\CacheClearer\ChainCacheClearer</parameter>
         <parameter key="file_locator.class">Symfony\Component\HttpKernel\Config\FileLocator</parameter>
         <parameter key="uri_signer.class">Symfony\Component\HttpKernel\UriSigner</parameter>
-        <parameter key="request_stack.class">Symfony\Component\HttpKernel\RequestStack</parameter>
-        <parameter key="request_context.class">Symfony\Component\HttpKernel\RequestContext</parameter>
+        <parameter key="request_stack.class">Symfony\Component\HttpFoundation\RequestStack</parameter>
     </parameters>
 
     <services>
@@ -28,12 +27,7 @@
             <argument type="service" id="request_stack" />
         </service>
 
-        <service id="request_stack" class="%request_stack.class%" public="false">
-        </service>
-
-        <service id="request_context" class="%request_context.class%">
-            <argument type="service" id="request_stack" />
-        </service>
+        <service id="request_stack" class="%request_stack.class%" />
 
         <service id="cache_warmer" class="%cache_warmer.class%">
             <argument type="collection" />

Resources/config/web.xml

@@ -38,7 +38,7 @@
             <tag name="kernel.event_subscriber" />
             <argument>%kernel.default_locale%</argument>
             <argument type="service" id="router" on-invalid="ignore" />
-            <argument type="service" id="request_context" />
+            <argument type="service" id="request_stack" />
         </service>
     </services>
 </container>