[FrameworkBundle] Directly injected formats into request listener

symfony · gquemener · Dec 25, 2013 · Dec 26, 2013 · Dec 27, 2013 · Dec 27, 2013
commit 829c6c95154ae4689c2083966e21005f84ac4ee2
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -396,8 +396,11 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
     private function registerRequestConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if ($config['additional_formats']) {
-            $container->setParameter('request.additional_formats', $config['additional_formats']);
             $loader->load('request.xml');
+            $container
+                ->getDefinition('request.add_request_formats_listener')
+                ->replaceArgument(0, $config['additional_formats'])
+            ;
         }
     }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml
@@ -11,7 +11,7 @@
     <services>
         <service id="request.add_request_formats_listener" class="%request.add_request_formats_listener.class%">
             <tag name="kernel.event_subscriber" />
-            <argument>%request.additional_formats%</argument>
+            <argument/>
         </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -150,7 +150,8 @@ public function testRequest()
         $container = $this->createContainerFromFile('full');
 
         $this->assertTrue($container->hasDefinition('request.add_request_formats_listener'), '->registerRequestConfiguration() loads request.xml');
-        $this->assertEquals(array('csv' => array('text/csv', 'text/plain'), 'pdf' => array('application/pdf')), $container->getParameter('request.additional_formats'));
+        $listenerDef = $container->getDefinition('request.add_request_formats_listener');
+        $this->assertEquals(array('csv' => array('text/csv', 'text/plain'), 'pdf' => array('application/pdf')), $listenerDef->getArgument(0));
     }
 
     public function testEmptyAdditionalRequestFormats()