Merge pull request #1015 from feridmovsumov/master

Added new feature for nice error messages to ParamFetcher

Author: lsmith77

Request/ParamFetcher.php

@@ -210,10 +210,8 @@ public function cleanParamWithRequirements(Param $config, $param, $strict)
                         sprintf("%s parameter is an array", $paramType)
                     );
                 }
-
                 return $default;
             }
-
             $constraint = new Regex(array(
                 'pattern' => '#^'.$config->requirements.'$#xsu',
                 'message' => sprintf(
@@ -223,10 +221,15 @@ public function cleanParamWithRequirements(Param $config, $param, $strict)
                     $config->requirements
                 ),
             ));
+        } elseif (is_array($constraint) && isset($constraint["rule"]) && $constraint["error_message"]) {
+            $constraint = new Regex(array(
+                'pattern' => '#^'.$config->requirements["rule"].'$#xsu',
+                'message' => $config->requirements["error_message"]
+            ));
+        }
 
-            if (false === $config->allowBlank) {
-                $constraint = array(new NotBlank(), $constraint);
-            }
+        if (false === $config->allowBlank) {
+            $constraint = array(new NotBlank(), $constraint);
         }
 
         if ($this->validator instanceof ValidatorInterface) {
@@ -237,9 +240,13 @@ public function cleanParamWithRequirements(Param $config, $param, $strict)
 
         if (0 !== count($errors)) {
             if ($strict) {
-                throw new BadRequestHttpException($this->violationFormatter->formatList($config, $errors));
+                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);
             }
-
             return null === $default ? '' : $default;
         }
 

Tests/Request/ParamFetcherTest.php

@@ -709,4 +709,47 @@ public function testNullValidatorWithoutRequirements()
         $queryFetcher->setController($this->controller);
         $this->assertEquals('foobar', $queryFetcher->get('bizoo'));
     }
+
+    public function testCustomErrorMessage()
+    {
+        $param = new QueryParam();
+        $param->name = 'fero';
+        $errorMessage = "variable must be an integer";
+        $param->requirements = array('rule' => '\d+', 'error_message' => $errorMessage);
+        $param->description = 'integer value';
+        $param->strict = true;
+
+        $request = new Request(array('fero' => 'foobar'), array(), array('_controller' => __CLASS__.'::stubAction'));
+        $reader  = $this->getMockBuilder('FOS\RestBundle\Request\ParamReader')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $reader->expects($this->any())
+            ->method('read')
+            ->will($this->returnValue(array('fero' => $param)));
+
+        $constraint = new Regex(array(
+            'pattern' => '#^\d+$#xsu',
+            'message' => $errorMessage,
+        ));
+
+        $errors = new ConstraintViolationList(array(
+            new ConstraintViolation($errorMessage, null, array(), null, null, null),
+        ));
+
+        $this->validator->expects($this->once())
+            ->method('validateValue')
+            ->with('foobar', $constraint)
+            ->will($this->returnValue($errors));
+
+        $queryFetcher =  new ParamFetcher($reader, $request, $this->violationFormatter, $this->validator);
+        $queryFetcher->setController($this->controller);
+
+        try {
+            $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());
+        }
+    }
 }