do not set a format if one is already set in the View instance

cordoval · Oct 9, 2011 · 1d22038 · 1d22038
1 parent 1c7ae10
commit 1d22038
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/EventListener/ViewResponseListener.php b/EventListener/ViewResponseListener.php
@@ -81,7 +81,9 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
             $view = new View($view);
         }
 
-        $view->setFormat($request->getRequestFormat());
+        if (null === $view->getFormat()) {
+            $view->setFormat($request->getRequestFormat());
+        }
 
         $vars = $request->attributes->get('_template_vars');
         if (!$vars) {

diff --git a/Tests/EventListener/ViewResponseListenerTest.php b/Tests/EventListener/ViewResponseListenerTest.php
@@ -74,9 +74,9 @@ public function testOnKernelView()
 
         $view = $this->getMockBuilder('\FOS\RestBundle\View\View')->disableOriginalConstructor()->getMock();
 
-        $view->expects($this->once())
+        $view->expects($this->exactly(2))
         ->method('getFormat')
-        ->will($this->returnValue('html'));
+        ->will($this->onConsecutiveCalls(null, 'html'));
 
         $viewHandler = $this->getMock('\FOS\RestBundle\View\ViewHandlerInterface');
         $viewHandler->expects($this->once())