diff --git a/src/Symfony/Component/ErrorRenderer/Resources/stubs/Exception/FlattenException.php b/src/Symfony/Component/ErrorRenderer/Resources/stubs/Exception/FlattenException.php deleted file mode 100644 index f17f5711a37c6..0000000000000 --- a/src/Symfony/Component/ErrorRenderer/Resources/stubs/Exception/FlattenException.php +++ /dev/null @@ -1,25 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Debug\Exception; - -if (!class_exists(FlattenException::class, false)) { - class_alias(\Symfony\Component\ErrorRenderer\Exception\FlattenException::class, FlattenException::class); -} - -if (false) { - /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorRenderer\Exception\FlattenException instead. - */ - class FlattenException extends \Symfony\Component\ErrorRenderer\Exception\FlattenException - { - } -} diff --git a/src/Symfony/Component/ErrorRenderer/composer.json b/src/Symfony/Component/ErrorRenderer/composer.json index 47a51e8a7a618..6966dbe72ae2a 100644 --- a/src/Symfony/Component/ErrorRenderer/composer.json +++ b/src/Symfony/Component/ErrorRenderer/composer.json @@ -33,7 +33,6 @@ }, "autoload": { "psr-4": { "Symfony\\Component\\ErrorRenderer\\": "" }, - "classmap": [ "Resources/stubs/Exception/FlattenException.php" ], "exclude-from-classmap": [ "/Tests/" ] diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md index 5a38841153b6b..d8646e6ae749e 100644 --- a/src/Symfony/Component/HttpKernel/CHANGELOG.md +++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md @@ -27,6 +27,7 @@ CHANGELOG * removed the second and third argument of `FileLocator::__construct` * removed loading resources from `%kernel.root_dir%/Resources` and `%kernel.root_dir%` as fallback directories. + * removed `exception` attribute passed to the configured controller of the `ExceptionListener` 4.4.0 ----- diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php index 2d7e33298690f..b52ca664bf58c 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php @@ -12,7 +12,6 @@ namespace Symfony\Component\HttpKernel\EventListener; use Psr\Log\LoggerInterface; -use Symfony\Component\Debug\Exception\FlattenException as LegacyFlattenException; use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; @@ -115,21 +114,9 @@ protected function logException(\Exception $exception, string $message) */ protected function duplicateRequest(\Exception $exception, Request $request): Request { - @trigger_error(sprintf('Passing the "exception" attribute (instance of "%s") to the configured controller of the "%s" class is deprecated since Symfony 4.4, use the passed "e" attribute (instance of "%s") instead.', LegacyFlattenException::class, self::class, FlattenException::class)); - - $flattenException = FlattenException::createFromThrowable($exception); - - // BC layer to be removed in 5.0 - if (class_exists(\Symfony\Component\Debug\Debug::class, false)) { - $legacyFlattenException = LegacyFlattenException::createFromThrowable($exception); - } else { - $legacyFlattenException = $flattenException; - } - $attributes = [ '_controller' => $this->controller, - 'exception' => $legacyFlattenException, // to be removed in 5.0 - 'e' => $flattenException, + 'e' => FlattenException::createFromThrowable($exception), 'logger' => $this->logger instanceof DebugLoggerInterface ? $this->logger : null, ]; $request = $request->duplicate(null, null, $attributes); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy