Merge pull request #1376 from FriendsOfSymfony/FIX

Fix the TwigExceptionController

Author: GuilhemN

Controller/TemplatingExceptionController.php

@@ -35,11 +35,10 @@ public function __construct(
      * Finds the template for the given format and status code.
      *
      * @param Request $request
-     * @param string  $format
      * @param int     $statusCode
      * @param bool    $showException
      *
      * @return TemplateReferenceInterface
      */
-    abstract protected function findTemplate(Request $request, $format, $statusCode, $showException);
+    abstract protected function findTemplate(Request $request, $statusCode, $showException);
 }

Controller/TwigExceptionController.php

@@ -26,7 +26,7 @@ class TwigExceptionController extends TemplatingExceptionController
     protected function createView(\Exception $exception, $code, array $templateData, Request $request, $showException)
     {
         $view = parent::createView($exception, $code, $templateData, $request, $showException);
-        $view->setTemplate($this->findTemplate($request, $format, $code, $showException));
+        $view->setTemplate($this->findTemplate($request, $code, $showException));
 
         return $view;
     }
@@ -37,8 +37,10 @@ protected function createView(\Exception $exception, $code, array $templateData,
      * This code is inspired by TwigBundle and should be synchronized on a regular basis
      * see src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
      */
-    protected function findTemplate(Request $request, $format, $statusCode, $showException)
+    protected function findTemplate(Request $request, $statusCode, $showException)
     {
+        $format = $request->getRequestFormat();
+
         $name = $showException ? 'exception' : 'error';
         if ($showException && 'html' == $format) {
             $name = 'exception_full';

DependencyInjection/FOSRestExtension.php

@@ -323,7 +323,7 @@ private function loadException(array $config, XmlFileLoader $loader, ContainerBu
             }
 
             $container->getDefinition('fos_rest.exception.controller')
-                ->replaceArgument(2, $config['exception']['codes']);
+                ->replaceArgument(1, $config['exception']['codes']);
             $container->getDefinition('fos_rest.serializer.exception_normalizer.jms')
                 ->replaceArgument(0, $config['exception']['messages']);
             $container->getDefinition('fos_rest.serializer.exception_normalizer.symfony')

Tests/Functional/ErrorWithTemplatingFormatTest.php

@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the FOSRestBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\RestBundle\Tests\Functional;
+
+/**
+ * @author Ener-Getick <[email protected]>
+ */
+class ErrorWithTemplatingFormatTest extends WebTestCase
+{
+    public function testSerializeExceptionHtml()
+    {
+        $this->iniSet('error_log', file_exists('/dev/null') ? '/dev/null' : 'nul');
+
+        $client = $this->createClient(['test_case' => 'Serializer', 'debug' => false]);
+        $client->request('GET', '/serializer-error/exception.html');
+
+        $this->assertContains('The server returned a "500 Internal Server Error".', $client->getResponse()->getContent());
+        $this->assertNotContains('Something bad happened', $client->getResponse()->getContent());
+    }
+
+    public function testSerializeExceptionHtmlInDebugMode()
+    {
+        $this->iniSet('error_log', file_exists('/dev/null') ? '/dev/null' : 'nul');
+
+        $client = $this->createClient(['test_case' => 'Serializer', 'debug' => true]);
+        $client->request('GET', '/serializer-error/exception.html');
+
+        $this->assertContains('Something bad happened. (500 Internal Server Error)', $client->getResponse()->getContent());
+    }
+}

Tests/Functional/WebTestCase.php

@@ -42,11 +42,13 @@ protected static function createKernel(array $options = [])
             throw new \InvalidArgumentException('The option "test_case" must be set.');
         }
 
+        $debug = isset($options['debug']) ? $options['debug'] : true;
+
         return new $class(
             $options['test_case'],
             isset($options['root_config']) ? $options['root_config'] : 'config.yml',
-            isset($options['environment']) ? $options['environment'] : 'fosrestbundletest'.strtolower($options['test_case']),
-            isset($options['debug']) ? $options['debug'] : true
+            isset($options['environment']) ? $options['environment'] : 'fosrestbundletest'.strtolower($options['test_case']).(int) $debug,
+            $debug
         );
     }
 }

Tests/Functional/app/Serializer/bundles.php

@@ -11,6 +11,7 @@
 
 return [
     new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+    new \Symfony\Bundle\TwigBundle\TwigBundle(),
     new \FOS\RestBundle\FOSRestBundle(),
     new \FOS\RestBundle\Tests\Functional\Bundle\TestBundle\TestBundle(),
 ];

Tests/Functional/app/Serializer/config.yml

@@ -5,6 +5,8 @@ imports:
 framework:
     serializer:
         enabled: true
+    templating:
+        engines: ['twig']
 
 fos_rest:
     view: