Merge pull request #1374 from FriendsOfSymfony/FIX

Fix a warning and typos

Author: GuilhemN

Controller/TwigExceptionController.php

@@ -12,7 +12,6 @@
 namespace FOS\RestBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
-use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -24,9 +23,9 @@ class TwigExceptionController extends TemplatingExceptionController
     /**
      * {@inheritdoc}
      */
-    protected function createView($format, FlattenException $exception, $code, $parameters, Request $request, $showException)
+    protected function createView(\Exception $exception, $code, array $templateData, Request $request, $showException)
     {
-        $view = parent::createView($format, $exception, $code, $parameters, $request, $showException);
+        $view = parent::createView($exception, $code, $templateData, $request, $showException);
         $view->setTemplate($this->findTemplate($request, $format, $code, $showException));
 
         return $view;

Resources/doc/2-the-view-layer.rst

@@ -203,7 +203,7 @@ A response example of an invalid form:
 If you don't like the default exception structure, you can provide your own
 normalizers.
 
-You can look `FOSRestBundle normalizers`_ for examples.
+You can look at `FOSRestBundle normalizers`_ for examples.
 
 .. _`FOSRestBundle normalizers`: https://github.com/FriendsOfSymfony/FOSRestBundle/tree/master/Serializer/Normalizer
 

Resources/doc/format_listener.rst

@@ -35,7 +35,7 @@ Setting ``priorities`` to a non-empty array enables Accept header negotiations.
                 - { path: '^/image', priorities: ['jpeg', 'gif'], fallback_format: false, prefer_extension: true }
                 # setting fallback_format to null means that in case of a priority mismatch the next rule will be considered
                 - { path: '^/admin', methods: [ 'GET', 'POST'], priorities: [ 'xml', 'html'], fallback_format: ~, prefer_extension: false }
-                # you can target specifically the exception controller
+                # you can specifically target the exception controller
                 - { path: '^/api', priorities: [ 'xml', 'json'], fallback_format: xml, attributes: [ _controller: FOS\RestBundle\Controller\ExceptionController ], prefer_extension: false }
                 # setting a priority to */* basically means any format will be matched
                 - { path: '^/', priorities: [ 'text/html', '*/*'], fallback_format: html, prefer_extension: true }