[ParamFetcher] Fix default resolving

Author: GuilhemN

Request/ParamFetcher.php

@@ -101,17 +101,19 @@ public function get($name, $strict = null)
         /** @var ParamInterface $param */
         $param = $params[$name];
         $default = $param->getDefault();
+        $default = $this->resolveValue($this->container, $default);
         $strict = (null !== $strict ? $strict : $param->isStrict());
 
         $paramValue = $param->getValue($this->getRequest(), $default);
 
-        return $this->cleanParamWithRequirements($param, $paramValue, $strict);
+        return $this->cleanParamWithRequirements($param, $paramValue, $strict, $default);
     }
 
     /**
      * @param ParamInterface $param
      * @param mixed          $paramValue
      * @param bool           $strict
+     * @param mixed          $default
      *
      * @throws BadRequestHttpException
      * @throws \RuntimeException
@@ -120,11 +122,8 @@ public function get($name, $strict = null)
      *
      * @internal
      */
-    protected function cleanParamWithRequirements(ParamInterface $param, $paramValue, $strict)
+    protected function cleanParamWithRequirements(ParamInterface $param, $paramValue, $strict, $default)
     {
-        $default = $param->getDefault();
-        $default = $this->resolveValue($this->container, $default);
-
         $this->checkNotIncompatibleParams($param);
         if ($default !== null && $default === $paramValue) {
             return $paramValue;

Tests/Functional/Bundle/TestBundle/Controller/ParamFetcherController.php

@@ -24,8 +24,8 @@ class ParamFetcherController extends FOSRestController
 {
     /**
      * @RequestParam(name="raw", requirements=@IdenticalTo({"foo"="raw", "bar"="foo"}), default="invalid")
-     * @RequestParam(name="map", map=true, requirements=@IdenticalTo({"foo"="map", "foobar"="foo"}), default="%invalid% %%")
-     * @RequestParam(name="bar", map=true, requirements="%foo% foo", strict=true)
+     * @RequestParam(name="map", map=true, requirements=@IdenticalTo({"foo"="map", "foobar"="foo"}), default="%invalid2% %%")
+     * @RequestParam(name="bar", map=true, requirements="%bar% foo", strict=true)
      */
     public function paramsAction(ParamFetcherInterface $fetcher)
     {
@@ -34,7 +34,7 @@ public function paramsAction(ParamFetcherInterface $fetcher)
 
     /**
      * @QueryParam(name="foo", default="invalid")
-     * @RequestParam(name="bar", default="foo")
+     * @RequestParam(name="bar", default="%foo%")
      */
     public function testAction(Request $request, ParamFetcherInterface $fetcher)
     {

Tests/Functional/app/ParamFetcher/config.yml

@@ -2,8 +2,9 @@ imports:
     - { resource: ../config/default.yml }
 
 parameters:
-    foo: bar
-    invalid: invalid2
+    bar: bar
+    foo: foo
+    invalid2: invalid2
 
 framework:
     serializer:

Tests/Request/ParamFetcherTest.php

@@ -138,10 +138,6 @@ public function testDefaultReplacement()
     public function testReturnBeforeGettingConstraints()
     {
         $param = $this->getMockBuilder(\FOS\RestBundle\Controller\Annotations\ParamInterface::class)->getMock();
-        $param
-            ->expects($this->once())
-            ->method('getDefault')
-            ->willReturn('default');
         $param
             ->expects($this->never())
             ->method('getConstraints');
@@ -150,7 +146,7 @@ public function testReturnBeforeGettingConstraints()
 
         $this->assertEquals(
             'default',
-            $method->invokeArgs($fetcher, array($param, 'default', null))
+            $method->invokeArgs($fetcher, array($param, 'default', null, 'default'))
         );
     }
 
@@ -161,7 +157,7 @@ public function testReturnWhenEmptyConstraints()
 
         $this->assertEquals(
             'value',
-            $method->invokeArgs($fetcher, array($param, 'value', null))
+            $method->invokeArgs($fetcher, array($param, 'value', null, null))
         );
     }
 
@@ -198,7 +194,7 @@ public function testNoValidationErrors()
             ->with('value', array('constraint'))
             ->willReturn(array());
 
-        $this->assertEquals('value', $method->invokeArgs($fetcher, array($param, 'value', null)));
+        $this->assertEquals('value', $method->invokeArgs($fetcher, array($param, 'value', null, null)));
     }
 
     public function testValidationErrors()
@@ -218,7 +214,7 @@ public function testValidationErrors()
             ->with('value', ['constraint'])
             ->willReturn($errors);
 
-        $this->assertEquals('default', $method->invokeArgs($fetcher, array($param, 'value', false)));
+        $this->assertEquals('default', $method->invokeArgs($fetcher, array($param, 'value', false, 'default')));
     }
 
     public function testValidationException()
@@ -238,7 +234,7 @@ public function testValidationException()
             ->willReturn($errors);
 
         try {
-            $method->invokeArgs($fetcher, array($param, 'value', true));
+            $method->invokeArgs($fetcher, array($param, 'value', true, 'default'));
             $this->fail(sprintf('An exception must be thrown in %s', __METHOD__));
         } catch (InvalidParameterException $exception) {
             $this->assertSame($param, $exception->getParameter());
@@ -272,7 +268,7 @@ public function testValidationErrorsInStrictMode()
             ->with('value', array('constraint'))
             ->willReturn($errors);
 
-        $method->invokeArgs($fetcher, array($param, 'value', true));
+        $method->invokeArgs($fetcher, array($param, 'value', true, null));
     }
 
     protected function getFetcherToCheckValidation($param, array $constructionArguments = null)