Fix form error response code

Author: tonivdv

Tests/View/ViewHandlerTest.php

@@ -16,6 +16,7 @@
 use FOS\RestBundle\View\ViewHandler;
 use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
 use FOS\Rest\Util\Codes;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Form\FormView;
@@ -288,6 +289,58 @@ function ($method) use ($serializer) {
             ->will($this->returnValueMap($map));
     }
 
+    public function testShouldReturnErrorResponseWhenDataContainsFormAndFormIsNotValid()
+    {
+        $container = new Container();
+
+        $serializer = $this->getMock('JMS\Serializer\Serializer', array(), array(), '', false);
+        $serializer
+        ->expects($this->once())
+        ->method('serialize')
+        ->will(
+              $this->returnCallback(
+                  function ($data) {
+                      return serialize($data);
+                  }
+              )
+          );
+
+        $container->set('fos_rest.serializer', $serializer);
+        $container->set('fos_rest.view.exception_wrapper_handler', new ExceptionWrapperHandler());
+        $container->setParameter('fos_rest.serializer.exclusion_strategy.groups', 'foo');
+        $container->setParameter('fos_rest.serializer.exclusion_strategy.version', '1.0');
+        $container->setParameter('fos_rest.serializer.serialize_null', false);
+
+        //test
+        $viewHandler = new ViewHandler(null, $expectedFailedValidationCode = Codes::HTTP_I_AM_A_TEAPOT);
+        $viewHandler->setContainer($container);
+
+        $form = $this->getMock(
+            'Symfony\\Component\\Form\\Form',
+            array('createView', 'getData', 'isValid', 'isBound'),
+            array(),
+            '',
+            false
+        );
+        $form
+        ->expects($this->any())
+        ->method('isValid')
+        ->will($this->returnValue(false));
+        $form
+        ->expects($this->any())
+        ->method('isBound')
+        ->will($this->returnValue(true));
+
+        $view = new View($form);
+        $response = $viewHandler->createResponse($view, new Request, 'json');
+
+        $data = unserialize($response->getContent());
+        $this->assertInstanceOf('FOS\\RestBundle\\Util\\ExceptionWrapper', $data);
+        $this->assertEquals('Validation Failed', $this->readAttribute($data, 'message'));
+        $this->assertInstanceOf('Symfony\\Component\\Form\\Form', $this->readAttribute($data, 'errors'));
+        $this->assertEquals($expectedFailedValidationCode, $this->readAttribute($data, 'code'));
+    }
+
     public static function createResponseWithoutLocationDataProvider()
     {
         return array(

View/ViewHandler.php

@@ -454,7 +454,7 @@ private function getDataFromView(View $view)
         return $exceptionWrapperHandler->wrap(
             array(
                  'status'         => 'error',
-                 'status_code'    => $view->getResponse()->getStatusCode(),
+                 'status_code'    => $this->failedValidationCode,
                  'status_text'    => Response::$statusTexts[$view->getResponse()->getStatusCode()],
                  'currentContent' => '',
                  'message'        => 'Validation Failed',