symfony · Tobion · Jul 24, 2019 · Jul 22, 2019
diff --git a/UPGRADE-4.4.md b/UPGRADE-4.4.md
@@ -151,6 +151,74 @@ TwigBridge
 
  * Deprecated to pass `$rootDir` and `$fileLinkFormatter` as 5th and 6th argument respectively to the
    `DebugCommand::__construct()` method, swap the variables position.
+
+TwigBundle
+----------
+
+ * Deprecated default value `twig.controller.exception::showAction` of the `twig.exception_controller` configuration option, 
+   set it to `null` instead. This will also change the default error response format according to https://tools.ietf.org/html/rfc7807
+   for `json`, `xml`, `atom` and `txt` formats:
+
+   Before:
+   ```json
+   { 
+       "error": { 
+           "code": 404, 
+           "message": "Sorry, the page you are looking for could not be found" 
+       } 
+   }
+   ```
+
+   After:
+   ```json
+   { 
+       "title": "Not Found",
+       "status": 404, 
+       "detail": "Sorry, the page you are looking for could not be found"
+   }
+   ```
+
+ * Deprecated the `ExceptionController` and all built-in error templates, use the error renderer mechanism of the `ErrorRenderer` component
+ * Deprecated loading custom error templates in non-html formats. Custom HTML error pages based on Twig keep working as before: 
+
+   Before (`templates/bundles/TwigBundle/Exception/error.jsonld.twig`):
+   ```twig
+   { 
+     "@id": "https://example.com",
+     "@type": "error",
+     "@context": {
+         "title": "{{ status_text }}",
+         "code": {{ status_code }},
+         "message": "{{ exception.message }}"
+     }
+   }
+   ```
+
+   After (`App\ErrorRenderer\JsonLdErrorRenderer`):
+   ```php
+   class JsonLdErrorRenderer implements ErrorRendererInterface
+   {
+     public static function getFormat(): string
+     {
+         return 'jsonld';
+     }
+
+     public function render(FlattenException $exception): string
+     {
+         return json_encode([
+             '@id' => 'https://example.com',
+             '@type' => 'error',
+             '@context' => [
+                 'title' => $exception->getTitle(),
+                 'code' => $exception->getStatusCode(),
+                 'message' => $exception->getMessage(),
+             ],
+         ]);
+     }
+   }
+   ```
+
+  Configure your rendering service tagging it with `error_renderer.renderer`.
 
 Validator
 ---------

diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -467,6 +467,8 @@ TwigBundle
  * The default value (`false`) of the `twig.strict_variables` configuration option has been changed to `%kernel.debug%`.
  * The `transchoice` tag and filter have been removed, use the `trans` ones instead with a `%count%` parameter.
  * Removed support for legacy templates directories `src/Resources/views/` and `src/Resources/<BundleName>/views/`, use `templates/` and `templates/bundles/<BundleName>/` instead.
+ * The default value (`twig.controller.exception::showAction`) of the `twig.exception_controller` configuration option has been changed to `null`.
+ * Removed `ExceptionController` class and all built-in error templates
 
 TwigBridge
 ----------

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/config.yml
@@ -7,3 +7,4 @@ framework:
 
 twig:
     strict_variables: '%kernel.debug%'
+    exception_controller: ~
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -52,7 +52,7 @@
         "symfony/stopwatch": "^3.4|^4.0|^5.0",
         "symfony/translation": "^4.3|^5.0",
         "symfony/templating": "^3.4|^4.0|^5.0",
-        "symfony/twig-bundle": "^3.4|^4.0|^5.0",
+        "symfony/twig-bundle": "^4.4|^5.0",
         "symfony/validator": "^4.1|^5.0",
         "symfony/var-dumper": "^4.3|^5.0",
         "symfony/workflow": "^4.3|^5.0",
@@ -80,6 +80,7 @@
         "symfony/stopwatch": "<3.4",
         "symfony/translation": "<4.3",
         "symfony/twig-bridge": "<4.1.1",
+        "symfony/twig-bundle": "<4.4",
         "symfony/validator": "<4.1",
         "symfony/workflow": "<4.3"
     },

@@ -70,6 +70,6 @@ public function testDefaultJsonLoginBadRequest()
 
         $this->assertSame(400, $response->getStatusCode());
         $this->assertSame('application/json', $response->headers->get('Content-Type'));
-        $this->assertArraySubset(['error' => ['code' => 400, 'message' => 'Bad Request']], json_decode($response->getContent(), true));
+        $this->assertArraySubset(['title' => 'Bad Request', 'status' => 400, 'detail' => 'Invalid JSON.'], json_decode($response->getContent(), true));
     }
 }
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\Tests\Functional\app;
+
+use Symfony\Component\ErrorRenderer\ErrorRenderer;
+use Symfony\Component\ErrorRenderer\ErrorRenderer\HtmlErrorRenderer;
+use Symfony\Component\ErrorRenderer\ErrorRenderer\JsonErrorRenderer;
+use Symfony\Component\ErrorRenderer\Exception\FlattenException;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class ExceptionController
+{
+    private $errorRenderer;
+
+    public function __construct()
+    {
+        $this->errorRenderer = new ErrorRenderer([
+            new HtmlErrorRenderer(),
+            new JsonErrorRenderer(),
+        ]);
+    }
+
+    public function __invoke(Request $request, FlattenException $exception)
+    {
+        return new Response($this->errorRenderer->render($exception, $request->getPreferredFormat()), $exception->getStatusCode());
+    }
+}
@@ -12,5 +12,4 @@
 return [
     new Symfony\Bundle\SecurityBundle\SecurityBundle(),
     new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-    new Symfony\Bundle\TwigBundle\TwigBundle(),
 ];
@@ -1,5 +1,5 @@
 imports:
-    - { resource: ./../config/default.yml }
+    - { resource: ./../config/framework.yml }
 services:
     Symfony\Component\Ldap\Ldap:
         arguments: ['@Symfony\Component\Ldap\Adapter\ExtLdap\Adapter']

@@ -11,10 +11,8 @@
 
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
-use Symfony\Bundle\TwigBundle\TwigBundle;
 
 return [
     new FrameworkBundle(),
     new SecurityBundle(),
-    new TwigBundle(),
 ];
@@ -1,5 +1,5 @@
 imports:
-    - { resource: ./../config/default.yml }
+    - { resource: ./../config/framework.yml }
 
 services:
     # alias the service so we can access it in the tests

@@ -2,3 +2,4 @@
 twig:
     debug:            '%kernel.debug%'
     strict_variables: '%kernel.debug%'
+    exception_controller: Symfony\Bundle\SecurityBundle\Tests\Functional\app\ExceptionController
@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "symfony/config": "^4.2|^5.0",
         "symfony/dependency-injection": "^4.2|^5.0",
-        "symfony/http-kernel": "^4.3",
+        "symfony/http-kernel": "^4.4",
         "symfony/security-core": "^4.3",
         "symfony/security-csrf": "^4.2|^5.0",
         "symfony/security-guard": "^4.2|^5.0",
@@ -33,10 +33,10 @@
         "symfony/css-selector": "^3.4|^4.0|^5.0",
         "symfony/dom-crawler": "^3.4|^4.0|^5.0",
         "symfony/form": "^3.4|^4.0|^5.0",
-        "symfony/framework-bundle": "^4.2|^5.0",
+        "symfony/framework-bundle": "^4.4|^5.0",
         "symfony/http-foundation": "^3.4|^4.0|^5.0",
         "symfony/translation": "^3.4|^4.0|^5.0",
-        "symfony/twig-bundle": "^4.2|^5.0",
+        "symfony/twig-bundle": "^4.4|^5.0",
         "symfony/twig-bridge": "^3.4|^4.0|^5.0",
         "symfony/process": "^3.4|^4.0|^5.0",
         "symfony/validator": "^3.4|^4.0|^5.0",
@@ -48,9 +48,9 @@
     },
     "conflict": {
         "symfony/browser-kit": "<4.2",
-        "symfony/twig-bundle": "<4.2",
+        "symfony/twig-bundle": "<4.4",
         "symfony/var-dumper": "<3.4",
-        "symfony/framework-bundle": "<4.2",
+        "symfony/framework-bundle": "<4.4",
         "symfony/console": "<3.4"
     },
     "autoload": {

@@ -6,6 +6,9 @@ CHANGELOG
 
  * marked the `TemplateIterator` as `internal`
  * added HTML comment to beginning and end of `exception_full.html.twig`
+ * added a new `TwigHtmlErrorRenderer` for `html` format, integrated with the `ErrorRenderer` component 
+ * deprecated `ExceptionController` class and all built-in error templates in favor of the new error renderer mechanism
+ * deprecated default value `twig.controller.exception::showAction` of `twig.exception_controller` configuration option, set it to `null` instead
 
 4.2.0
 -----

@@ -19,12 +19,16 @@
 use Twig\Error\LoaderError;
 use Twig\Loader\ExistsLoaderInterface;
 
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use the ErrorRenderer component instead.', ExceptionController::class), E_USER_DEPRECATED);
+
 /**
  * ExceptionController renders error or exception pages for a given
  * FlattenException.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Matthias Pigulla <mp@webfactory.de>
+ *
+ * @deprecated since Symfony 4.4, use the ErrorRenderer component instead.
  */
 class ExceptionController
 {

@@ -11,8 +11,10 @@
 
 namespace Symfony\Bundle\TwigBundle\Controller;
 
+use Symfony\Component\ErrorRenderer\ErrorRenderer;
 use Symfony\Component\ErrorRenderer\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
@@ -26,16 +28,22 @@ class PreviewErrorController
 {
     protected $kernel;
     protected $controller;
+    private $errorRenderer;
 
-    public function __construct(HttpKernelInterface $kernel, $controller)
+    public function __construct(HttpKernelInterface $kernel, $controller, ErrorRenderer $errorRenderer = null)
     {
         $this->kernel = $kernel;
         $this->controller = $controller;
+        $this->errorRenderer = $errorRenderer;
     }
 
     public function previewErrorPageAction(Request $request, $code)
     {
-        $exception = FlattenException::createFromThrowable(new \Exception('Something has intentionally gone wrong.'), $code);
+        $exception = FlattenException::createFromThrowable(new \Exception('Something has intentionally gone wrong.'), $code, ['X-Debug' => false]);
+
+        if (null === $this->controller && null !== $this->errorRenderer) {
+            return new Response($this->errorRenderer->render($exception, $request->getPreferredFormat()), $code);
+        }
 
         /*
          * This Request mimics the parameters set by

@@ -34,7 +34,13 @@ public function getConfigTreeBuilder()
 
         $rootNode
             ->children()
-                ->scalarNode('exception_controller')->defaultValue('twig.controller.exception::showAction')->end()
+                ->scalarNode('exception_controller')
+                    ->defaultValue(static function () {
+                        @trigger_error('Relying on the default value ("twig.controller.exception::showAction") of the "twig.exception_controller" configuration option is deprecated since Symfony 4.4, set it to "null" explicitly instead, which will be the new default in 5.0.', E_USER_DEPRECATED);
+
+                        return 'twig.controller.exception::showAction';
+                    })
+                ->end()
             ->end()
         ;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ framework:

		twig:
		strict_variables: '%kernel.debug%'
		exception_controller: ~