Merge pull request #897 from mvrhov/fix_866

Fix the bug introdiced in PR #866, where the $format was never set.

Author: lsmith77

EventListener/FormatListener.php

@@ -49,8 +49,8 @@ public function onKernelRequest(GetResponseEvent $event)
         try {
             $request = $event->getRequest();
 
-            $format = null;
-            if (null === $request->getRequestFormat(null)) {
+            $format = $request->getRequestFormat(null);
+            if (null === $format) {
                 if ($this->formatNegotiator instanceof MediaTypeNegotiatorInterface) {
                     $mediaType = $this->formatNegotiator->getBestMediaType($request);
                     if ($mediaType) {

Tests/EventListener/FormatListenerTest.php

@@ -143,4 +143,41 @@ public function useSpecifiedFormatDataProvider()
             array('json', 'json'),
         );
     }
+
+    /**
+     * Generates a request like a symfony fragment listener does.
+     * Set request type to master
+     */
+    public function testSfFragmentFormat()
+    {
+        $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $request = new Request();
+        $attributes = array ( '_locale' => 'en', '_format' => 'json', '_controller' => 'FooBundle:Index:featured', );
+        $request->attributes->add($attributes);
+        $request->attributes->set('_route_params', array_replace($request->attributes->get('_route_params', array()), $attributes));
+
+        $event->expects($this->once())
+            ->method('getRequest')
+            ->will($this->returnValue($request));
+
+        $event->expects($this->any())
+            ->method('getRequestType')
+            ->will($this->returnValue(HttpKernelInterface::MASTER_REQUEST));
+
+        $formatNegotiator = $this->getMockBuilder('FOS\RestBundle\Util\FormatNegotiator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $formatNegotiator->expects($this->any())
+            ->method('getBestMediaType')
+            ->will($this->returnValue('application/json'));
+
+        $listener = new FormatListener($formatNegotiator);
+
+        $listener->onKernelRequest($event);
+
+        $this->assertEquals($request->getRequestFormat(), 'json');
+    }
 }