Replace the ViolationFormatter by a new exception

Author: GuilhemN

Exception/InvalidParameterException.php

@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the FOSRestBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\RestBundle\Exception;
+
+use FOS\RestBundle\Controller\Annotations\Param;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
+
+class InvalidParameterException extends BadRequestHttpException
+{
+    private $parameter;
+    private $violations;
+
+    public function __construct(Param $parameter, ConstraintViolationListInterface $violations)
+    {
+        $this->parameter = $parameter;
+        $this->violations = $violations;
+
+        $message = '';
+        foreach ($violations as $key => $violation) {
+            if ($key > 0) {
+                $message .= "\n";
+            }
+            $message .= sprintf(
+                'Parameter "%s" of value "%s" violated a constraint "%s"',
+                $parameter->name,
+                $violation->getInvalidValue(),
+                $violation->getMessage()
+            );
+        }
+        parent::__construct($message);
+    }
+
+    public function getParameter()
+    {
+        return $this->parameter;
+    }
+
+    public function getViolations()
+    {
+        return $this->violations;
+    }
+}

Request/ParamFetcher.php

@@ -15,6 +15,7 @@
 use FOS\RestBundle\Controller\Annotations\Param;
 use FOS\RestBundle\Controller\Annotations\RequestParam;
 use FOS\RestBundle\Util\ViolationFormatterInterface;
+use FOS\RestBundle\Exception\InvalidParameterException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -38,11 +39,7 @@ class ParamFetcher implements ParamFetcherInterface, ContainerAwareInterface
     private $parameterBag;
     private $requestStack;
     private $validator;
-    private $violationFormatter;
-    /**
-     * @var callable
-     */
-    private $controller;
+
     /**
      * @var ContainerInterface
      *
@@ -67,7 +64,6 @@ public function __construct(ParamReader $paramReader, $requestStack, ViolationFo
         }
 
         $this->requestStack = $requestStack;
-        $this->violationFormatter = $violationFormatter;
         $this->validator = $validator;
 
         $this->parameterBag = new ParameterBag($paramReader);
@@ -260,12 +256,7 @@ public function cleanParamWithRequirements(Param $config, $param, $strict)
 
         if (0 !== count($errors)) {
             if ($strict) {
-                if (is_array($config->requirements) && isset($config->requirements['error_message'])) {
-                    $errorMessage = $config->requirements['error_message'];
-                } else {
-                    $errorMessage = $this->violationFormatter->formatList($config, $errors);
-                }
-                throw new BadRequestHttpException($errorMessage);
+                throw new InvalidParameterException($config, $errors);
             }
 
             return null === $default ? '' : $default;

Tests/Request/ParamFetcherTest.php

@@ -592,7 +592,7 @@ public function testConstraintThrowExceptionInStrictMode()
 
         $this->setExpectedException(
             '\\Symfony\\Component\\HttpKernel\\Exception\\BadRequestHttpException',
-            'foobar'
+            "Parameter \"bizoo\" of value \"\" violated a constraint \"expected message 1\"\nParameter \"bizoo\" of value \"\" violated a constraint \"expected message 2\""
         );
 
         $queryFetcher = new ParamFetcher($reader, $requestStack, $this->violationFormatter, $this->validator);
@@ -812,7 +812,7 @@ public function testCustomErrorMessage()
             $queryFetcher->get('fero');
             $this->fail('Fetching get() in strict mode with no default value did not throw an exception');
         } catch (HttpException $httpException) {
-            $this->assertEquals($errorMessage, $httpException->getMessage());
+            $this->assertEquals('Parameter "fero" of value "" violated a constraint "variable must be an integer"', $httpException->getMessage());
         }
     }
 }