Change requestName to key and add entry on annotations reference

Author: eduardosoliv

Controller/Annotations/Param.php

@@ -22,7 +22,7 @@ abstract class Param
     /** @var string */
     public $name;
     /** @var string */
-    public $requestName = null;
+    public $key = null;
     /** @var string */
     public $requirements = '';
     /** @var mixed */
@@ -35,4 +35,12 @@ abstract class Param
     public $array = false;
     /** @var boolean */
     public $nullable = false;
+
+    /**
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key ?: $this->name;
+    }
 }

Request/ParamFetcher.php

@@ -94,11 +94,10 @@ public function get($name, $strict = null)
             $strict = $config->strict;
         }
 
-        $requestName = $config->requestName ? $config->requestName : $config->name;
         if ($config instanceof RequestParam) {
-            $param = $this->request->request->get($requestName, $default);
+            $param = $this->request->request->get($config->getKey(), $default);
         } elseif ($config instanceof QueryParam) {
-            $param = $this->request->query->get($requestName, $default);
+            $param = $this->request->query->get($config->getKey(), $default);
         } else {
             $param = null;
         }

Resources/doc/annotations-reference.md

@@ -11,6 +11,7 @@ use FOS\RestBundle\Controller\Annotations\QueryParam;
 /**
  * @QueryParam(
  *   name="",
+ *   key=null,
  *   requirements="",
  *   default=null,
  *   description="",
@@ -29,6 +30,7 @@ use FOS\RestBundle\Controller\Annotations\RequestParam;
 /**
  * @RequestParam(
  *   name="",
+ *   key=null,
  *   requirements="",
  *   default=null,
  *   description="",

Tests/Request/ParamFetcherTest.php

@@ -76,7 +76,7 @@ public function setup()
 
         $annotations['biz'] = new QueryParam;
         $annotations['biz']->name = 'biz';
-        $annotations['biz']->requestName = 'business';
+        $annotations['biz']->key = 'business';
         $annotations['biz']->requirements = '\d+';
         $annotations['biz']->default = null;
         $annotations['biz']->nullable = true;
@@ -332,7 +332,7 @@ public function testExceptionOnNonConfiguredParameter()
         $queryFetcher->get('none', '42');
     }
 
-    public function testRequestName()
+    public function testKeyPrecedenceOverName()
     {
         $queryFetcher = $this->getParamFetcher(array('business' => 5));
         $queryFetcher->setController($this->controller);