From fb5b0429b2933a3ef00f1c8f413f674ca14d8304 Mon Sep 17 00:00:00 2001 From: Yonel Ceruto Date: Tue, 9 Jul 2019 19:52:59 -0400 Subject: [PATCH] Rename ErrorCatcher to ErrorRenderer (rendering part only) --- .../FrameworkExtension.php | 2 +- .../FrameworkBundle/FrameworkBundle.php | 4 +- .../Resources/config/debug_prod.xml | 2 +- .../Resources/config/error_catcher.xml | 37 ------------------- .../Resources/config/error_renderer.xml | 37 +++++++++++++++++++ .../Bundle/FrameworkBundle/composer.json | 2 +- .../Controller/ExceptionController.php | 2 +- .../Controller/PreviewErrorController.php | 2 +- .../Compiler/ExceptionListenerPass.php | 2 +- .../Controller/ExceptionControllerTest.php | 2 +- .../Controller/PreviewErrorControllerTest.php | 2 +- src/Symfony/Bundle/TwigBundle/composer.json | 2 +- .../Controller/ExceptionController.php | 2 +- .../Resources/config/profiler.xml | 2 +- .../WebProfilerExtensionTest.php | 4 +- src/Symfony/Component/Debug/CHANGELOG.md | 2 +- .../Debug/Exception/FlattenException.php | 8 ++-- .../.gitignore | 0 .../CHANGELOG.md | 0 .../ErrorRendererPass.php} | 8 ++-- .../LazyLoadingErrorRenderer.php} | 6 +-- .../ErrorRenderer.php} | 9 +++-- .../ErrorRenderer/ErrorRendererInterface.php | 4 +- .../ErrorRenderer/HtmlErrorRenderer.php | 4 +- .../ErrorRenderer/JsonErrorRenderer.php | 4 +- .../ErrorRenderer/TxtErrorRenderer.php | 4 +- .../ErrorRenderer/XmlErrorRenderer.php | 4 +- .../ErrorRendererNotFoundException.php | 2 +- .../Exception/FlattenException.php | 2 +- .../{ErrorCatcher => ErrorRenderer}/LICENSE | 0 .../{ErrorCatcher => ErrorRenderer}/README.md | 4 +- .../ErrorRendererPassTest.php} | 28 +++++++------- .../LazyLoadingErrorRendererTest.php} | 16 ++++---- .../ErrorRenderer/HtmlErrorRendererTest.php | 6 +-- .../ErrorRenderer/JsonErrorRendererTest.php | 6 +-- .../ErrorRenderer/TxtErrorRendererTest.php | 6 +-- .../ErrorRenderer/XmlErrorRendererTest.php | 6 +-- .../Tests/ErrorRendererTest.php} | 18 ++++----- .../Tests/Exception/FlattenExceptionTest.php | 4 +- .../composer.json | 6 +-- .../phpunit.xml.dist | 2 +- .../DataCollector/ExceptionDataCollector.php | 2 +- .../EventListener/DebugHandlersListener.php | 20 +++++----- .../EventListener/ExceptionListener.php | 2 +- .../ExceptionDataCollectorTest.php | 2 +- .../Component/HttpKernel/composer.json | 2 +- ...ailedMessageToFailureTransportListener.php | 2 +- .../Messenger/Stamp/RedeliveryStamp.php | 2 +- .../Tests/Stamp/RedeliveryStampTest.php | 2 +- src/Symfony/Component/Messenger/composer.json | 2 +- .../VarDumper/Cloner/AbstractCloner.php | 2 +- 51 files changed, 151 insertions(+), 150 deletions(-) delete mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/config/error_catcher.xml create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/.gitignore (100%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/CHANGELOG.md (100%) rename src/Symfony/Component/{ErrorCatcher/DependencyInjection/ErrorCatcherPass.php => ErrorRenderer/DependencyInjection/ErrorRendererPass.php} (87%) rename src/Symfony/Component/{ErrorCatcher/DependencyInjection/LazyLoadingErrorFormatter.php => ErrorRenderer/DependencyInjection/LazyLoadingErrorRenderer.php} (84%) rename src/Symfony/Component/{ErrorCatcher/ErrorRenderer/ErrorFormatter.php => ErrorRenderer/ErrorRenderer.php} (88%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/ErrorRenderer/ErrorRendererInterface.php (84%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/ErrorRenderer/HtmlErrorRenderer.php (99%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/ErrorRenderer/JsonErrorRenderer.php (90%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/ErrorRenderer/TxtErrorRenderer.php (96%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/ErrorRenderer/XmlErrorRenderer.php (96%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/Exception/ErrorRendererNotFoundException.php (85%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/Exception/FlattenException.php (99%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/LICENSE (100%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/README.md (74%) rename src/Symfony/Component/{ErrorCatcher/Tests/DependencyInjection/ErrorCatcherPassTest.php => ErrorRenderer/Tests/DependencyInjection/ErrorRendererPassTest.php} (56%) rename src/Symfony/Component/{ErrorCatcher/Tests/DependencyInjection/LazyLoadingErrorFormatterTest.php => ErrorRenderer/Tests/DependencyInjection/LazyLoadingErrorRendererTest.php} (72%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/Tests/ErrorRenderer/HtmlErrorRendererTest.php (79%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/Tests/ErrorRenderer/JsonErrorRendererTest.php (80%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/Tests/ErrorRenderer/TxtErrorRendererTest.php (77%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/Tests/ErrorRenderer/XmlErrorRendererTest.php (79%) rename src/Symfony/Component/{ErrorCatcher/Tests/ErrorRenderer/ErrorFormatterTest.php => ErrorRenderer/Tests/ErrorRendererTest.php} (67%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/Tests/Exception/FlattenExceptionTest.php (99%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/composer.json (85%) rename src/Symfony/Component/{ErrorCatcher => ErrorRenderer}/phpunit.xml.dist (91%) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index edc160747d..3f84d2a44f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -154,7 +154,7 @@ class FrameworkExtension extends Extension $loader->load('web.xml'); $loader->load('services.xml'); $loader->load('fragment_renderer.xml'); - $loader->load('error_catcher.xml'); + $loader->load('error_renderer.xml'); if (interface_exists(PsrEventDispatcherInterface::class)) { $container->setAlias(PsrEventDispatcherInterface::class, 'event_dispatcher'); diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php index 0ef349ddb5..f9a9d56b56 100644 --- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php +++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php @@ -33,7 +33,7 @@ use Symfony\Component\Debug\ErrorHandler; use Symfony\Component\DependencyInjection\Compiler\PassConfig; use Symfony\Component\DependencyInjection\Compiler\RegisterReverseContainerPass; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\ErrorCatcher\DependencyInjection\ErrorCatcherPass; +use Symfony\Component\ErrorRenderer\DependencyInjection\ErrorRendererPass; use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass; use Symfony\Component\Form\DependencyInjection\FormPass; use Symfony\Component\HttpFoundation\Request; @@ -91,7 +91,7 @@ class FrameworkBundle extends Bundle KernelEvents::FINISH_REQUEST, ]; - $container->addCompilerPass(new ErrorCatcherPass()); + $container->addCompilerPass(new ErrorRendererPass()); $container->addCompilerPass(new LoggerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32); $container->addCompilerPass(new RegisterControllerArgumentLocatorsPass()); $container->addCompilerPass(new RemoveEmptyControllerArgumentLocatorsPass(), PassConfig::TYPE_BEFORE_REMOVING); diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml index 2204ba7b0f..f95b218d52 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml @@ -22,7 +22,7 @@ %kernel.debug% %kernel.charset% - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_catcher.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_catcher.xml deleted file mode 100644 index d2810aff2b..0000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_catcher.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - %kernel.debug% - %kernel.charset% - %debug.file_link_format% - - - - - %kernel.debug% - - - - - - %kernel.debug% - %kernel.charset% - - - - - %kernel.debug% - %kernel.charset% - - - diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml new file mode 100644 index 0000000000..f6b5f241ea --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + %kernel.debug% + %kernel.charset% + %debug.file_link_format% + + + + + %kernel.debug% + + + + + + %kernel.debug% + %kernel.charset% + + + + + %kernel.debug% + %kernel.charset% + + + diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 242d05ab62..cb4bec153c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -21,7 +21,7 @@ "symfony/cache": "^4.4|^5.0", "symfony/config": "^4.2|^5.0", "symfony/dependency-injection": "^4.4|^5.0", - "symfony/error-catcher": "^4.4|^5.0", + "symfony/error-renderer": "^4.4|^5.0", "symfony/http-foundation": "^4.3|^5.0", "symfony/http-kernel": "^4.4|^5.0", "symfony/polyfill-mbstring": "~1.0", diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php index af5e2c81b3..e1d7760826 100644 --- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php @@ -11,7 +11,7 @@ namespace Symfony\Bundle\TwigBundle\Controller; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Log\DebugLoggerInterface; diff --git a/src/Symfony/Bundle/TwigBundle/Controller/PreviewErrorController.php b/src/Symfony/Bundle/TwigBundle/Controller/PreviewErrorController.php index 70f3d99df4..80c79f45ee 100644 --- a/src/Symfony/Bundle/TwigBundle/Controller/PreviewErrorController.php +++ b/src/Symfony/Bundle/TwigBundle/Controller/PreviewErrorController.php @@ -11,7 +11,7 @@ namespace Symfony\Bundle\TwigBundle\Controller; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\HttpKernelInterface; diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php index a1809b2779..ff5a0e2207 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php @@ -28,7 +28,7 @@ class ExceptionListenerPass implements CompilerPassInterface } // register the exception controller only if Twig is enabled and required dependencies do exist - if (!class_exists('Symfony\Component\ErrorCatcher\Exception\FlattenException') || !interface_exists('Symfony\Component\EventDispatcher\EventSubscriberInterface')) { + if (!class_exists('Symfony\Component\ErrorRenderer\Exception\FlattenException') || !interface_exists('Symfony\Component\EventDispatcher\EventSubscriberInterface')) { $container->removeDefinition('twig.exception_listener'); } elseif ($container->hasParameter('templating.engines')) { $engines = $container->getParameter('templating.engines'); diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php index 1c32b6e2c5..ee7c20746a 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php @@ -13,7 +13,7 @@ namespace Symfony\Bundle\TwigBundle\Tests\Controller; use Symfony\Bundle\TwigBundle\Controller\ExceptionController; use Symfony\Bundle\TwigBundle\Tests\TestCase; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\HttpFoundation\Request; use Twig\Environment; use Twig\Loader\ArrayLoader; diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php index 295631438f..f007e630e6 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php @@ -13,7 +13,7 @@ namespace Symfony\Bundle\TwigBundle\Tests\Controller; use Symfony\Bundle\TwigBundle\Controller\PreviewErrorController; use Symfony\Bundle\TwigBundle\Tests\TestCase; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\HttpKernelInterface; diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 5c7195fbba..fd6c08debe 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^7.1.3", - "symfony/error-catcher": "^4.4|^5.0", + "symfony/error-renderer": "^4.4|^5.0", "symfony/twig-bridge": "^4.4|^5.0", "symfony/http-foundation": "^4.3|^5.0", "symfony/http-kernel": "^4.4|^5.0", diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php index 91b861c805..4666efff94 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php @@ -11,7 +11,7 @@ namespace Symfony\Bundle\WebProfilerBundle\Controller; -use Symfony\Component\ErrorCatcher\ErrorRenderer\HtmlErrorRenderer; +use Symfony\Component\ErrorRenderer\ErrorRenderer\HtmlErrorRenderer; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Debug\FileLinkFormatter; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml index 2a6a252e08..dcacc51032 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml @@ -27,7 +27,7 @@ %kernel.debug% - + diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php index e9a66e42fb..cfbee00bd0 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php @@ -17,7 +17,7 @@ use Symfony\Component\DependencyInjection\Container; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\ErrorCatcher\ErrorRenderer\HtmlErrorRenderer; +use Symfony\Component\ErrorRenderer\ErrorRenderer\HtmlErrorRenderer; use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass; use Symfony\Component\EventDispatcher\EventDispatcher; @@ -54,7 +54,7 @@ class WebProfilerExtensionTest extends TestCase $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock(); $this->container = new ContainerBuilder(); - $this->container->register('error_catcher.renderer.html', HtmlErrorRenderer::class); + $this->container->register('error_renderer.renderer.html', HtmlErrorRenderer::class); $this->container->register('event_dispatcher', EventDispatcher::class)->setPublic(true); $this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'))->setPublic(true); $this->container->register('twig', 'Twig\Environment')->setPublic(true); diff --git a/src/Symfony/Component/Debug/CHANGELOG.md b/src/Symfony/Component/Debug/CHANGELOG.md index e84aa18552..437113854e 100644 --- a/src/Symfony/Component/Debug/CHANGELOG.md +++ b/src/Symfony/Component/Debug/CHANGELOG.md @@ -4,7 +4,7 @@ CHANGELOG 4.4.0 ----- - * deprecated `FlattenException`, use the `FlattenException` of the `ErrorCatcher` component + * deprecated `FlattenException`, use the `FlattenException` of the `ErrorRenderer` component 4.3.0 ----- diff --git a/src/Symfony/Component/Debug/Exception/FlattenException.php b/src/Symfony/Component/Debug/Exception/FlattenException.php index 8dda8f7223..eaed1f1fa6 100644 --- a/src/Symfony/Component/Debug/Exception/FlattenException.php +++ b/src/Symfony/Component/Debug/Exception/FlattenException.php @@ -14,7 +14,7 @@ namespace Symfony\Component\Debug\Exception; use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface; use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; -@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "Symfony\Component\ErrorCatcher\Exception\FlattenException" instead.', FlattenException::class), E_USER_DEPRECATED); +@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "Symfony\Component\ErrorRenderer\Exception\FlattenException" instead.', FlattenException::class), E_USER_DEPRECATED); /** * FlattenException wraps a PHP Error or Exception to be able to serialize it. @@ -23,7 +23,7 @@ use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; * * @author Fabien Potencier * - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\Exception\FlattenException instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorRenderer\Exception\FlattenException instead. */ class FlattenException { @@ -39,11 +39,11 @@ class FlattenException private $line; /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\Exception::createFromThrowable() instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorRenderer\Exception::createFromThrowable() instead. */ public static function create(\Exception $exception, $statusCode = null, array $headers = []) { - @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\Exception::createFromThrowable() instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.4, use Symfony\Component\ErrorRenderer\Exception::createFromThrowable() instead.', __METHOD__), E_USER_DEPRECATED); return static::createFromThrowable($exception, $statusCode, $headers); } diff --git a/src/Symfony/Component/ErrorCatcher/.gitignore b/src/Symfony/Component/ErrorRenderer/.gitignore similarity index 100% rename from src/Symfony/Component/ErrorCatcher/.gitignore rename to src/Symfony/Component/ErrorRenderer/.gitignore diff --git a/src/Symfony/Component/ErrorCatcher/CHANGELOG.md b/src/Symfony/Component/ErrorRenderer/CHANGELOG.md similarity index 100% rename from src/Symfony/Component/ErrorCatcher/CHANGELOG.md rename to src/Symfony/Component/ErrorRenderer/CHANGELOG.md diff --git a/src/Symfony/Component/ErrorCatcher/DependencyInjection/ErrorCatcherPass.php b/src/Symfony/Component/ErrorRenderer/DependencyInjection/ErrorRendererPass.php similarity index 87% rename from src/Symfony/Component/ErrorCatcher/DependencyInjection/ErrorCatcherPass.php rename to src/Symfony/Component/ErrorRenderer/DependencyInjection/ErrorRendererPass.php index a6c17c9f8f..aa502efac2 100644 --- a/src/Symfony/Component/ErrorCatcher/DependencyInjection/ErrorCatcherPass.php +++ b/src/Symfony/Component/ErrorRenderer/DependencyInjection/ErrorRendererPass.php @@ -9,23 +9,23 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\DependencyInjection; +namespace Symfony\Component\ErrorRenderer\DependencyInjection; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorRendererInterface; +use Symfony\Component\ErrorRenderer\ErrorRenderer\ErrorRendererInterface; /** * @author Yonel Ceruto */ -class ErrorCatcherPass implements CompilerPassInterface +class ErrorRendererPass implements CompilerPassInterface { private $rendererService; private $rendererTag; - public function __construct(string $rendererService = 'error_catcher.error_formatter', string $rendererTag = 'error_catcher.renderer') + public function __construct(string $rendererService = 'error_renderer', string $rendererTag = 'error_renderer.renderer') { $this->rendererService = $rendererService; $this->rendererTag = $rendererTag; diff --git a/src/Symfony/Component/ErrorCatcher/DependencyInjection/LazyLoadingErrorFormatter.php b/src/Symfony/Component/ErrorRenderer/DependencyInjection/LazyLoadingErrorRenderer.php similarity index 84% rename from src/Symfony/Component/ErrorCatcher/DependencyInjection/LazyLoadingErrorFormatter.php rename to src/Symfony/Component/ErrorRenderer/DependencyInjection/LazyLoadingErrorRenderer.php index 451814257e..82936a29af 100644 --- a/src/Symfony/Component/ErrorCatcher/DependencyInjection/LazyLoadingErrorFormatter.php +++ b/src/Symfony/Component/ErrorRenderer/DependencyInjection/LazyLoadingErrorRenderer.php @@ -9,17 +9,17 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\DependencyInjection; +namespace Symfony\Component\ErrorRenderer\DependencyInjection; use Psr\Container\ContainerInterface; -use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorFormatter; +use Symfony\Component\ErrorRenderer\ErrorRenderer; /** * Lazily loads error renderers from the dependency injection container. * * @author Yonel Ceruto */ -class LazyLoadingErrorFormatter extends ErrorFormatter +class LazyLoadingErrorRenderer extends ErrorRenderer { private $container; private $initialized = []; diff --git a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorFormatter.php b/src/Symfony/Component/ErrorRenderer/ErrorRenderer.php similarity index 88% rename from src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorFormatter.php rename to src/Symfony/Component/ErrorRenderer/ErrorRenderer.php index 2dd10fe4fe..da984bdd18 100644 --- a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorFormatter.php +++ b/src/Symfony/Component/ErrorRenderer/ErrorRenderer.php @@ -9,10 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\ErrorRenderer; +namespace Symfony\Component\ErrorRenderer; -use Symfony\Component\ErrorCatcher\Exception\ErrorRendererNotFoundException; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\ErrorRenderer\ErrorRendererInterface; +use Symfony\Component\ErrorRenderer\Exception\ErrorRendererNotFoundException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; /** * Formats an exception to be used as response content. @@ -23,7 +24,7 @@ use Symfony\Component\ErrorCatcher\Exception\FlattenException; * * @author Yonel Ceruto */ -class ErrorFormatter +class ErrorRenderer { private $renderers = []; diff --git a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorRendererInterface.php b/src/Symfony/Component/ErrorRenderer/ErrorRenderer/ErrorRendererInterface.php similarity index 84% rename from src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorRendererInterface.php rename to src/Symfony/Component/ErrorRenderer/ErrorRenderer/ErrorRendererInterface.php index ea9fde40aa..5c0d580602 100644 --- a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorRendererInterface.php +++ b/src/Symfony/Component/ErrorRenderer/ErrorRenderer/ErrorRendererInterface.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\ErrorRenderer; +namespace Symfony\Component\ErrorRenderer\ErrorRenderer; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; /** * Interface for classes that can render errors in a specific format. diff --git a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorRenderer/ErrorRenderer/HtmlErrorRenderer.php similarity index 99% rename from src/Symfony/Component/ErrorCatcher/ErrorRenderer/HtmlErrorRenderer.php rename to src/Symfony/Component/ErrorRenderer/ErrorRenderer/HtmlErrorRenderer.php index 831f313be2..03a3029369 100644 --- a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/HtmlErrorRenderer.php +++ b/src/Symfony/Component/ErrorRenderer/ErrorRenderer/HtmlErrorRenderer.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\ErrorRenderer; +namespace Symfony\Component\ErrorRenderer\ErrorRenderer; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\HttpKernel\Debug\FileLinkFormatter; /** diff --git a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/JsonErrorRenderer.php b/src/Symfony/Component/ErrorRenderer/ErrorRenderer/JsonErrorRenderer.php similarity index 90% rename from src/Symfony/Component/ErrorCatcher/ErrorRenderer/JsonErrorRenderer.php rename to src/Symfony/Component/ErrorRenderer/ErrorRenderer/JsonErrorRenderer.php index cd61300170..66f9af1058 100644 --- a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/JsonErrorRenderer.php +++ b/src/Symfony/Component/ErrorRenderer/ErrorRenderer/JsonErrorRenderer.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\ErrorRenderer; +namespace Symfony\Component\ErrorRenderer\ErrorRenderer; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; /** * @author Yonel Ceruto diff --git a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/TxtErrorRenderer.php b/src/Symfony/Component/ErrorRenderer/ErrorRenderer/TxtErrorRenderer.php similarity index 96% rename from src/Symfony/Component/ErrorCatcher/ErrorRenderer/TxtErrorRenderer.php rename to src/Symfony/Component/ErrorRenderer/ErrorRenderer/TxtErrorRenderer.php index e191bbc3fb..46799afaad 100644 --- a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/TxtErrorRenderer.php +++ b/src/Symfony/Component/ErrorRenderer/ErrorRenderer/TxtErrorRenderer.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\ErrorRenderer; +namespace Symfony\Component\ErrorRenderer\ErrorRenderer; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; /** * @author Yonel Ceruto diff --git a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/XmlErrorRenderer.php b/src/Symfony/Component/ErrorRenderer/ErrorRenderer/XmlErrorRenderer.php similarity index 96% rename from src/Symfony/Component/ErrorCatcher/ErrorRenderer/XmlErrorRenderer.php rename to src/Symfony/Component/ErrorRenderer/ErrorRenderer/XmlErrorRenderer.php index c64df7e17e..5134e8e4f8 100644 --- a/src/Symfony/Component/ErrorCatcher/ErrorRenderer/XmlErrorRenderer.php +++ b/src/Symfony/Component/ErrorRenderer/ErrorRenderer/XmlErrorRenderer.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\ErrorRenderer; +namespace Symfony\Component\ErrorRenderer\ErrorRenderer; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; /** * @author Yonel Ceruto diff --git a/src/Symfony/Component/ErrorCatcher/Exception/ErrorRendererNotFoundException.php b/src/Symfony/Component/ErrorRenderer/Exception/ErrorRendererNotFoundException.php similarity index 85% rename from src/Symfony/Component/ErrorCatcher/Exception/ErrorRendererNotFoundException.php rename to src/Symfony/Component/ErrorRenderer/Exception/ErrorRendererNotFoundException.php index 05721b0751..4020ced161 100644 --- a/src/Symfony/Component/ErrorCatcher/Exception/ErrorRendererNotFoundException.php +++ b/src/Symfony/Component/ErrorRenderer/Exception/ErrorRendererNotFoundException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\Exception; +namespace Symfony\Component\ErrorRenderer\Exception; class ErrorRendererNotFoundException extends \RuntimeException { diff --git a/src/Symfony/Component/ErrorCatcher/Exception/FlattenException.php b/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php similarity index 99% rename from src/Symfony/Component/ErrorCatcher/Exception/FlattenException.php rename to src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php index f783b6e620..29d1685583 100644 --- a/src/Symfony/Component/ErrorCatcher/Exception/FlattenException.php +++ b/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\Exception; +namespace Symfony\Component\ErrorRenderer\Exception; use Symfony\Component\Debug\Exception\FatalThrowableError; use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface; diff --git a/src/Symfony/Component/ErrorCatcher/LICENSE b/src/Symfony/Component/ErrorRenderer/LICENSE similarity index 100% rename from src/Symfony/Component/ErrorCatcher/LICENSE rename to src/Symfony/Component/ErrorRenderer/LICENSE diff --git a/src/Symfony/Component/ErrorCatcher/README.md b/src/Symfony/Component/ErrorRenderer/README.md similarity index 74% rename from src/Symfony/Component/ErrorCatcher/README.md rename to src/Symfony/Component/ErrorRenderer/README.md index 7eba105932..272c2924d8 100644 --- a/src/Symfony/Component/ErrorCatcher/README.md +++ b/src/Symfony/Component/ErrorRenderer/README.md @@ -1,7 +1,7 @@ -ErrorCatcher Component +ErrorRenderer Component ====================== -The ErrorCatcher component provides tools to manage and display errors and exceptions. +The ErrorRenderer component provides tools to display errors and exceptions. Resources --------- diff --git a/src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/ErrorCatcherPassTest.php b/src/Symfony/Component/ErrorRenderer/Tests/DependencyInjection/ErrorRendererPassTest.php similarity index 56% rename from src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/ErrorCatcherPassTest.php rename to src/Symfony/Component/ErrorRenderer/Tests/DependencyInjection/ErrorRendererPassTest.php index f111ef4687..7fad3a5631 100644 --- a/src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/ErrorCatcherPassTest.php +++ b/src/Symfony/Component/ErrorRenderer/Tests/DependencyInjection/ErrorRendererPassTest.php @@ -9,42 +9,42 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\Tests\DependencyInjection; +namespace Symfony\Component\ErrorRenderer\Tests\DependencyInjection; use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\ServiceLocator; -use Symfony\Component\ErrorCatcher\DependencyInjection\ErrorCatcherPass; -use Symfony\Component\ErrorCatcher\DependencyInjection\LazyLoadingErrorFormatter; -use Symfony\Component\ErrorCatcher\ErrorRenderer\HtmlErrorRenderer; -use Symfony\Component\ErrorCatcher\ErrorRenderer\JsonErrorRenderer; +use Symfony\Component\ErrorRenderer\DependencyInjection\ErrorRendererPass; +use Symfony\Component\ErrorRenderer\DependencyInjection\LazyLoadingErrorRenderer; +use Symfony\Component\ErrorRenderer\ErrorRenderer\HtmlErrorRenderer; +use Symfony\Component\ErrorRenderer\ErrorRenderer\JsonErrorRenderer; -class ErrorCatcherPassTest extends TestCase +class ErrorRendererPassTest extends TestCase { public function testProcess() { $container = new ContainerBuilder(); $container->setParameter('kernel.debug', true); - $definition = $container->register('error_catcher.error_formatter', LazyLoadingErrorFormatter::class) + $definition = $container->register('error_renderer', LazyLoadingErrorRenderer::class) ->addArgument([]) ; - $container->register('error_catcher.renderer.html', HtmlErrorRenderer::class) - ->addTag('error_catcher.renderer') + $container->register('error_renderer.renderer.html', HtmlErrorRenderer::class) + ->addTag('error_renderer.renderer') ; - $container->register('error_catcher.renderer.json', JsonErrorRenderer::class) - ->addTag('error_catcher.renderer') + $container->register('error_renderer.renderer.json', JsonErrorRenderer::class) + ->addTag('error_renderer.renderer') ; - (new ErrorCatcherPass())->process($container); + (new ErrorRendererPass())->process($container); $serviceLocatorDefinition = $container->getDefinition((string) $definition->getArgument(0)); $this->assertSame(ServiceLocator::class, $serviceLocatorDefinition->getClass()); $expected = [ - 'html' => new ServiceClosureArgument(new Reference('error_catcher.renderer.html')), - 'json' => new ServiceClosureArgument(new Reference('error_catcher.renderer.json')), + 'html' => new ServiceClosureArgument(new Reference('error_renderer.renderer.html')), + 'json' => new ServiceClosureArgument(new Reference('error_renderer.renderer.json')), ]; $this->assertEquals($expected, $serviceLocatorDefinition->getArgument(0)); } diff --git a/src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/LazyLoadingErrorFormatterTest.php b/src/Symfony/Component/ErrorRenderer/Tests/DependencyInjection/LazyLoadingErrorRendererTest.php similarity index 72% rename from src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/LazyLoadingErrorFormatterTest.php rename to src/Symfony/Component/ErrorRenderer/Tests/DependencyInjection/LazyLoadingErrorRendererTest.php index b9be715eb7..3ee8e5aca7 100644 --- a/src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/LazyLoadingErrorFormatterTest.php +++ b/src/Symfony/Component/ErrorRenderer/Tests/DependencyInjection/LazyLoadingErrorRendererTest.php @@ -9,18 +9,18 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\Tests\DependencyInjection; +namespace Symfony\Component\ErrorRenderer\Tests\DependencyInjection; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; -use Symfony\Component\ErrorCatcher\DependencyInjection\LazyLoadingErrorFormatter; -use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorRendererInterface; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\DependencyInjection\LazyLoadingErrorRenderer; +use Symfony\Component\ErrorRenderer\ErrorRenderer\ErrorRendererInterface; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; -class LazyLoadingErrorFormatterTest extends TestCase +class LazyLoadingErrorRendererTest extends TestCase { /** - * @expectedException \Symfony\Component\ErrorCatcher\Exception\ErrorRendererNotFoundException + * @expectedException \Symfony\Component\ErrorRenderer\Exception\ErrorRendererNotFoundException * @expectedExceptionMessage No error renderer found for format "foo". */ public function testInvalidErrorRenderer() @@ -29,7 +29,7 @@ class LazyLoadingErrorFormatterTest extends TestCase $container->expects($this->once())->method('has')->with('foo')->willReturn(false); $exception = FlattenException::createFromThrowable(new \Exception('Foo')); - (new LazyLoadingErrorFormatter($container))->render($exception, 'foo'); + (new LazyLoadingErrorRenderer($container))->render($exception, 'foo'); } public function testCustomErrorRenderer() @@ -47,7 +47,7 @@ class LazyLoadingErrorFormatterTest extends TestCase ->willReturn(new FooErrorRenderer()) ; - $errorRenderer = new LazyLoadingErrorFormatter($container); + $errorRenderer = new LazyLoadingErrorRenderer($container); $exception = FlattenException::createFromThrowable(new \RuntimeException('Foo')); $this->assertSame('Foo', $errorRenderer->render($exception, 'foo')); diff --git a/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/HtmlErrorRendererTest.php b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/HtmlErrorRendererTest.php similarity index 79% rename from src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/HtmlErrorRendererTest.php rename to src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/HtmlErrorRendererTest.php index f211df072c..79040ad518 100644 --- a/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/HtmlErrorRendererTest.php +++ b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/HtmlErrorRendererTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\Tests\ErrorRenderer; +namespace Symfony\Component\ErrorRenderer\Tests\ErrorRenderer; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorCatcher\ErrorRenderer\HtmlErrorRenderer; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\ErrorRenderer\HtmlErrorRenderer; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; class HtmlErrorRendererTest extends TestCase { diff --git a/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/JsonErrorRendererTest.php b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/JsonErrorRendererTest.php similarity index 80% rename from src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/JsonErrorRendererTest.php rename to src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/JsonErrorRendererTest.php index 9b3848d945..9a9ca80aef 100644 --- a/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/JsonErrorRendererTest.php +++ b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/JsonErrorRendererTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\Tests\ErrorRenderer; +namespace Symfony\Component\ErrorRenderer\Tests\ErrorRenderer; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorCatcher\ErrorRenderer\JsonErrorRenderer; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\ErrorRenderer\JsonErrorRenderer; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; class JsonErrorRendererTest extends TestCase { diff --git a/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/TxtErrorRendererTest.php b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/TxtErrorRendererTest.php similarity index 77% rename from src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/TxtErrorRendererTest.php rename to src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/TxtErrorRendererTest.php index 8ee6ee3bf7..9e00c81216 100644 --- a/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/TxtErrorRendererTest.php +++ b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/TxtErrorRendererTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\Tests\ErrorRenderer; +namespace Symfony\Component\ErrorRenderer\Tests\ErrorRenderer; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorCatcher\ErrorRenderer\TxtErrorRenderer; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\ErrorRenderer\TxtErrorRenderer; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; class TxtErrorRendererTest extends TestCase { diff --git a/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/XmlErrorRendererTest.php b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/XmlErrorRendererTest.php similarity index 79% rename from src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/XmlErrorRendererTest.php rename to src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/XmlErrorRendererTest.php index dc2bf25995..25c49b3c5f 100644 --- a/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/XmlErrorRendererTest.php +++ b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/XmlErrorRendererTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\Tests\ErrorRenderer; +namespace Symfony\Component\ErrorRenderer\Tests\ErrorRenderer; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorCatcher\ErrorRenderer\XmlErrorRenderer; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\ErrorRenderer\XmlErrorRenderer; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; class XmlErrorRendererTest extends TestCase { diff --git a/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/ErrorFormatterTest.php b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRendererTest.php similarity index 67% rename from src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/ErrorFormatterTest.php rename to src/Symfony/Component/ErrorRenderer/Tests/ErrorRendererTest.php index a2596fe28f..6664b6008b 100644 --- a/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/ErrorFormatterTest.php +++ b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRendererTest.php @@ -9,23 +9,23 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\Tests\ErrorRenderer; +namespace Symfony\Component\ErrorRenderer\Tests; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorFormatter; -use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorRendererInterface; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\ErrorRenderer; +use Symfony\Component\ErrorRenderer\ErrorRenderer\ErrorRendererInterface; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; -class ErrorFormatterTest extends TestCase +class ErrorRendererTest extends TestCase { /** - * @expectedException \Symfony\Component\ErrorCatcher\Exception\ErrorRendererNotFoundException + * @expectedException \Symfony\Component\ErrorRenderer\Exception\ErrorRendererNotFoundException * @expectedExceptionMessage No error renderer found for format "foo". */ public function testErrorRendererNotFound() { $exception = FlattenException::createFromThrowable(new \Exception('foo')); - (new ErrorFormatter([]))->render($exception, 'foo'); + (new ErrorRenderer([]))->render($exception, 'foo'); } /** @@ -33,13 +33,13 @@ class ErrorFormatterTest extends TestCase */ public function testInvalidErrorRenderer() { - new ErrorFormatter([new \stdClass()]); + new ErrorRenderer([new \stdClass()]); } public function testCustomErrorRenderer() { $renderers = [new FooErrorRenderer()]; - $errorRenderer = new ErrorFormatter($renderers); + $errorRenderer = new ErrorRenderer($renderers); $exception = FlattenException::createFromThrowable(new \RuntimeException('Foo')); $this->assertSame('Foo', $errorRenderer->render($exception, 'foo')); diff --git a/src/Symfony/Component/ErrorCatcher/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/ErrorRenderer/Tests/Exception/FlattenExceptionTest.php similarity index 99% rename from src/Symfony/Component/ErrorCatcher/Tests/Exception/FlattenExceptionTest.php rename to src/Symfony/Component/ErrorRenderer/Tests/Exception/FlattenExceptionTest.php index 6a39025cc1..5994be2397 100644 --- a/src/Symfony/Component/ErrorCatcher/Tests/Exception/FlattenExceptionTest.php +++ b/src/Symfony/Component/ErrorRenderer/Tests/Exception/FlattenExceptionTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorCatcher\Tests\Exception; +namespace Symfony\Component\ErrorRenderer\Tests\Exception; use PHPUnit\Framework\TestCase; use Symfony\Component\Debug\Exception\FatalThrowableError; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; diff --git a/src/Symfony/Component/ErrorCatcher/composer.json b/src/Symfony/Component/ErrorRenderer/composer.json similarity index 85% rename from src/Symfony/Component/ErrorCatcher/composer.json rename to src/Symfony/Component/ErrorRenderer/composer.json index e8c2e74050..bf46db539d 100644 --- a/src/Symfony/Component/ErrorCatcher/composer.json +++ b/src/Symfony/Component/ErrorRenderer/composer.json @@ -1,7 +1,7 @@ { - "name": "symfony/error-catcher", + "name": "symfony/error-renderer", "type": "library", - "description": "Symfony ErrorCatcher Component", + "description": "Symfony ErrorRenderer Component", "keywords": [], "homepage": "https://symfony.com", "license": "MIT", @@ -29,7 +29,7 @@ "symfony/http-kernel": "<4.4" }, "autoload": { - "psr-4": { "Symfony\\Component\\ErrorCatcher\\": "" }, + "psr-4": { "Symfony\\Component\\ErrorRenderer\\": "" }, "exclude-from-classmap": [ "/Tests/" ] diff --git a/src/Symfony/Component/ErrorCatcher/phpunit.xml.dist b/src/Symfony/Component/ErrorRenderer/phpunit.xml.dist similarity index 91% rename from src/Symfony/Component/ErrorCatcher/phpunit.xml.dist rename to src/Symfony/Component/ErrorRenderer/phpunit.xml.dist index c5274e736f..c4c29459f3 100644 --- a/src/Symfony/Component/ErrorCatcher/phpunit.xml.dist +++ b/src/Symfony/Component/ErrorRenderer/phpunit.xml.dist @@ -13,7 +13,7 @@ - + ./Tests/ diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php index 62c10a1347..bda8aeddcf 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php @@ -11,7 +11,7 @@ namespace Symfony\Component\HttpKernel\DataCollector; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php index 9d78440e96..9d45d83786 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php @@ -17,9 +17,9 @@ use Symfony\Component\Console\Event\ConsoleEvent; use Symfony\Component\Console\Output\ConsoleOutputInterface; use Symfony\Component\Debug\ErrorHandler; use Symfony\Component\Debug\ExceptionHandler; -use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorFormatter; -use Symfony\Component\ErrorCatcher\ErrorRenderer\HtmlErrorRenderer; -use Symfony\Component\ErrorCatcher\Exception\ErrorRendererNotFoundException; +use Symfony\Component\ErrorRenderer\ErrorRenderer; +use Symfony\Component\ErrorRenderer\ErrorRenderer\HtmlErrorRenderer; +use Symfony\Component\ErrorRenderer\Exception\ErrorRendererNotFoundException; use Symfony\Component\EventDispatcher\Event; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Request; @@ -46,7 +46,7 @@ class DebugHandlersListener implements EventSubscriberInterface private $fileLinkFormat; private $scope; private $charset; - private $errorFormatter; + private $errorRenderer; private $firstCall = true; private $hasTerminatedWithException; @@ -59,7 +59,7 @@ class DebugHandlersListener implements EventSubscriberInterface * @param string|FileLinkFormatter|null $fileLinkFormat The format for links to source files * @param bool $scope Enables/disables scoping mode */ - public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = E_ALL, ?int $throwAt = E_ALL, bool $scream = true, $fileLinkFormat = null, bool $scope = true, string $charset = null, ErrorFormatter $errorFormatter = null) + public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = E_ALL, ?int $throwAt = E_ALL, bool $scream = true, $fileLinkFormat = null, bool $scope = true, string $charset = null, ErrorRenderer $errorRenderer = null) { $this->exceptionHandler = $exceptionHandler; $this->logger = $logger; @@ -69,7 +69,7 @@ class DebugHandlersListener implements EventSubscriberInterface $this->fileLinkFormat = $fileLinkFormat; $this->scope = $scope; $this->charset = $charset; - $this->errorFormatter = $errorFormatter; + $this->errorRenderer = $errorRenderer; } /** @@ -167,16 +167,16 @@ class DebugHandlersListener implements EventSubscriberInterface $debug = $this->scream && $this->scope; $controller = function (Request $request) use ($debug) { - if (null === $this->errorFormatter) { - $this->errorFormatter = new ErrorFormatter([new HtmlErrorRenderer($debug, $this->charset, $this->fileLinkFormat)]); + if (null === $this->errorRenderer) { + $this->errorRenderer = new ErrorRenderer([new HtmlErrorRenderer($debug, $this->charset, $this->fileLinkFormat)]); } $e = $request->attributes->get('exception'); try { - return new Response($this->errorFormatter->render($e, $request->getPreferredFormat()), $e->getStatusCode(), $e->getHeaders()); + return new Response($this->errorRenderer->render($e, $request->getPreferredFormat()), $e->getStatusCode(), $e->getHeaders()); } catch (ErrorRendererNotFoundException $_) { - return new Response($this->errorFormatter->render($e), $e->getStatusCode(), $e->getHeaders()); + return new Response($this->errorRenderer->render($e), $e->getStatusCode(), $e->getHeaders()); } }; diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php index 833a0e3b6b..8abec7717f 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php @@ -12,7 +12,7 @@ namespace Symfony\Component\HttpKernel\EventListener; use Psr\Log\LoggerInterface; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php index 08e0ebb2d4..8b1d1317d8 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php @@ -12,7 +12,7 @@ namespace Symfony\Component\HttpKernel\Tests\DataCollector; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector; diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index e2a954a3f6..52d026be20 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^7.1.3", "symfony/debug": "^4.4|^5.0", - "symfony/error-catcher": "^4.4|^5.0", + "symfony/error-renderer": "^4.4|^5.0", "symfony/event-dispatcher": "^4.3", "symfony/http-foundation": "^4.4|^5.0", "symfony/polyfill-ctype": "^1.8", diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php index 5f6099274c..2e431e654a 100644 --- a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php +++ b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Messenger\EventListener; use Psr\Log\LoggerInterface; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent; use Symfony\Component\Messenger\Exception\HandlerFailedException; diff --git a/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php b/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php index 97447db124..6a5042a105 100644 --- a/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php +++ b/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Messenger\Stamp; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\Messenger\Envelope; /** diff --git a/src/Symfony/Component/Messenger/Tests/Stamp/RedeliveryStampTest.php b/src/Symfony/Component/Messenger/Tests/Stamp/RedeliveryStampTest.php index dd4ace45fa..2b724a5f69 100644 --- a/src/Symfony/Component/Messenger/Tests/Stamp/RedeliveryStampTest.php +++ b/src/Symfony/Component/Messenger/Tests/Stamp/RedeliveryStampTest.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Messenger\Tests\Stamp; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorRenderer\Exception\FlattenException; use Symfony\Component\Messenger\Stamp\RedeliveryStamp; class RedeliveryStampTest extends TestCase diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json index 09ef22684d..02bcaec430 100644 --- a/src/Symfony/Component/Messenger/composer.json +++ b/src/Symfony/Component/Messenger/composer.json @@ -25,7 +25,7 @@ "doctrine/persistence": "~1.0", "symfony/console": "^3.4|^4.0|^5.0", "symfony/dependency-injection": "^3.4.19|^4.1.8|^5.0", - "symfony/error-catcher": "^4.4|^5.0", + "symfony/error-renderer": "^4.4|^5.0", "symfony/event-dispatcher": "^4.3|^5.0", "symfony/http-kernel": "^4.4|^5.0", "symfony/process": "^3.4|^4.0|^5.0", diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php index e2962fab6a..ea2b45ffa1 100644 --- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php +++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php @@ -85,7 +85,7 @@ abstract class AbstractCloner implements ClonerInterface 'Symfony\Component\VarDumper\Caster\TraceStub' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castTraceStub'], 'Symfony\Component\VarDumper\Caster\FrameStub' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castFrameStub'], 'Symfony\Component\VarDumper\Cloner\AbstractCloner' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'cutInternals'], - 'Symfony\Component\ErrorCatcher\Exception\SilencedErrorContext' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castSilencedErrorContext'], + 'Symfony\Component\Debug\Exception\SilencedErrorContext' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castSilencedErrorContext'], 'ProxyManager\Proxy\ProxyInterface' => ['Symfony\Component\VarDumper\Caster\ProxyManagerCaster', 'castProxy'], 'PHPUnit_Framework_MockObject_MockObject' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'cutInternals'],