Merge remote-tracking branch 'upstream/master' into request-param-optional-origin-name

Author: eduardosoliv

Controller/ExceptionController.php

@@ -173,7 +173,9 @@ protected function getExceptionMessage($exception)
         $exceptionMap = $this->container->getParameter('fos_rest.exception.messages');
         $showExceptionMessage = $this->isSubclassOf($exception, $exceptionMap);
 
-        return $showExceptionMessage || $this->container->get('kernel')->isDebug() ? $exception->getMessage() : '';
+        return $showExceptionMessage || $this->container->get('kernel')->isDebug()
+            ? $exception->getMessage()
+            : Response::$statusTexts[$this->getStatusCode($exception)];
     }
 
     /**
@@ -186,7 +188,7 @@ protected function getExceptionMessage($exception)
     protected function getStatusCode($exception)
     {
         $exceptionMap = $this->container->getParameter('fos_rest.exception.codes');
-        $isExceptionMappedToStatusCode = $this->isSubclassOf($exception, $exceptionMap);;
+        $isExceptionMappedToStatusCode = $this->isSubclassOf($exception, $exceptionMap);
 
         return ($isExceptionMappedToStatusCode) ? $isExceptionMappedToStatusCode : $exception->getStatusCode();
     }

EventListener/ParamFetcherListener.php

@@ -59,7 +59,7 @@ public function onKernelController(FilterControllerEvent $event)
         if ($this->setParamsAsAttributes) {
             $params = $paramFetcher->all();
             foreach ($params as $name => $param) {
-                if ($request->attributes->has($name) and null !== $request->attributes->get($name)) {
+                if ($request->attributes->has($name) && null !== $request->attributes->get($name)) {
                     $msg = sprintf("ParamFetcher parameter conflicts with a path parameter '$name' for route '%s'", $request->attributes->get('_route'));
                     throw new \InvalidArgumentException($msg);
                 }

Resources/doc/annotations-reference.md

@@ -0,0 +1,84 @@
+Full default annotations
+==========================
+
+### Param fetcher
+
+#### QueryParam
+
+```php
+use FOS\RestBundle\Controller\Annotations\QueryParam;
+
+/**
+ * @QueryParam(
+ *   name="",
+ *   requirements="",
+ *   default=null,
+ *   description="",
+ *   strict=false,
+ *   array=false,
+ *   nullable=false
+ * )
+ */
+```
+
+#### RequestParam
+
+```php
+use FOS\RestBundle\Controller\Annotations\RequestParam;
+
+/**
+ * @RequestParam(
+ *   name="",
+ *   requirements="",
+ *   default=null,
+ *   description="",
+ *   strict=true,
+ *   array=false,
+ *   nullable=false
+ * )
+ */
+```
+
+### View
+
+```php
+use FOS\RestBundle\Controller\Annotations\View;
+
+/**
+ * @View(
+ *  templateVar="",
+ *  statusCode=null,
+ *  serializerGroups={},
+ *  populateDefaultVars=true,
+ *  serializerEnableMaxDepthChecks=false
+ * )
+ */
+```
+
+### Routing
+
+#### Route prefix
+
+```php
+use FOS\RestBundle\Controller\Annotations\Prefix;
+
+/**
+ * @Prefix("")
+ */
+```
+
+#### Route name prefix
+
+```php
+use FOS\RestBundle\Controller\Annotations\NamePrefix;
+
+/**
+ * @NamePrefix("")
+ */
+```
+
+#### Route
+
+RestBundle extends the [@Route](http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/routing.html) annotation from Symfony.
+
+@Delete @Get @Head @Link @Patch @Post @Put @Unlink have the same options as @Route

Resources/doc/index.md

@@ -23,8 +23,9 @@ FOSRestBundle provides several tools to assist in building REST applications:
 - [Manual definition of routes](7-manual-route-definition.md)
 
 ### Config reference
-Check out the [configuration reference](configuration-reference.md) for a reference on the available configuration options.
 
+- [Configuration reference](configuration-reference.md) for a reference on the available configuration options
+- [Annotations reference](annotations-reference.md) for a reference on on the available configurations through annotations
 
 ### Example application(s)