diff --git a/composer.json b/composer.json index 955e6670dc5b1..dd64cfab8c799 100644 --- a/composer.json +++ b/composer.json @@ -49,6 +49,7 @@ "symfony/dom-crawler": "self.version", "symfony/dotenv": "self.version", "symfony/event-dispatcher": "self.version", + "symfony/error-catcher": "self.version", "symfony/expression-language": "self.version", "symfony/filesystem": "self.version", "symfony/finder": "self.version", diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php index cd6d14759ad51..02e2056a6d654 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php @@ -20,7 +20,7 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\ErrorHandler\Exception\FatalThrowableError; +use Symfony\Component\ErrorCatcher\Exception\FatalThrowableError; use Symfony\Component\HttpKernel\Bundle\Bundle; use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\HttpKernel\KernelInterface; diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 23969076fa4e6..c70f6eaa59dc9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -152,7 +152,7 @@ public function load(array $configs, ContainerBuilder $container) $loader->load('web.xml'); $loader->load('services.xml'); $loader->load('fragment_renderer.xml'); - $loader->load('error_renderer.xml'); + $loader->load('error_catcher.xml'); $container->registerAliasForArgument('parameter_bag', PsrContainerInterface::class); diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php index 33400a1a1c3df..5b505a573d54c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php +++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php @@ -32,8 +32,8 @@ use Symfony\Component\DependencyInjection\Compiler\PassConfig; use Symfony\Component\DependencyInjection\Compiler\RegisterReverseContainerPass; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\ErrorHandler\DependencyInjection\ErrorHandlerPass; -use Symfony\Component\ErrorHandler\ErrorHandler; +use Symfony\Component\ErrorCatcher\DependencyInjection\ErrorCatcherPass; +use Symfony\Component\ErrorCatcher\ErrorHandler; use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass; use Symfony\Component\Form\DependencyInjection\FormPass; use Symfony\Component\HttpFoundation\Request; @@ -91,7 +91,7 @@ public function build(ContainerBuilder $container) KernelEvents::FINISH_REQUEST, ]; - $this->addCompilerPassIfExists($container, ErrorHandlerPass::class); + $this->addCompilerPassIfExists($container, ErrorCatcherPass::class); $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/error_catcher.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_catcher.xml new file mode 100644 index 0000000000000..574b2280f6110 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_catcher.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/Resources/config/error_renderer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml deleted file mode 100644 index a1273350bb284..0000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml +++ /dev/null @@ -1,39 +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/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php index ba37e7fcac047..af5e2c81b3661 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\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\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 0c37a7d4e7553..427e6996f887c 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\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\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 2804aee393c65..a1809b2779ce8 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php @@ -28,7 +28,7 @@ public function process(ContainerBuilder $container) } // register the exception controller only if Twig is enabled and required dependencies do exist - if (!class_exists('Symfony\Component\ErrorHandler\Exception\FlattenException') || !interface_exists('Symfony\Component\EventDispatcher\EventSubscriberInterface')) { + if (!class_exists('Symfony\Component\ErrorCatcher\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 a85c0b834c74d..9301fe37e5bf6 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php @@ -13,7 +13,7 @@ use Symfony\Bundle\TwigBundle\Controller\ExceptionController; use Symfony\Bundle\TwigBundle\Tests\TestCase; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\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 51a8fd159b6f8..295631438fbc9 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php @@ -13,7 +13,7 @@ use Symfony\Bundle\TwigBundle\Controller\PreviewErrorController; use Symfony\Bundle\TwigBundle\Tests\TestCase; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\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 0f3cb58a0ba85..5c7195fbba00b 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/config": "^4.2|^5.0", + "symfony/error-catcher": "^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", @@ -35,7 +35,7 @@ "symfony/templating": "^3.4|^4.0|^5.0", "symfony/translation": "^4.2|^5.0", "symfony/yaml": "^3.4|^4.0|^5.0", - "symfony/framework-bundle": "^4.3|^5.0", + "symfony/framework-bundle": "^4.4|^5.0", "symfony/web-link": "^3.4|^4.0|^5.0", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0" diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php index 1e43adcf4c2bf..1328447bdde72 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\ErrorHandler\ErrorRenderer\HtmlErrorRenderer; +use Symfony\Component\ErrorCatcher\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 c1414bffb7371..2a6a252e08527 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 1658002468bb2..e9a66e42fbd03 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\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer; +use Symfony\Component\ErrorCatcher\ErrorRenderer\HtmlErrorRenderer; use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass; use Symfony\Component\EventDispatcher\EventDispatcher; @@ -54,7 +54,7 @@ protected function setUp() $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock(); $this->container = new ContainerBuilder(); - $this->container->register('error_handler.renderer.html', HtmlErrorRenderer::class); + $this->container->register('error_catcher.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/Console/Application.php b/src/Symfony/Component/Console/Application.php index 52ac6896090c3..44f5a536449d1 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -41,8 +41,8 @@ use Symfony\Component\Console\Output\ConsoleOutputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; -use Symfony\Component\ErrorHandler\ErrorHandler; -use Symfony\Component\ErrorHandler\Exception\FatalThrowableError; +use Symfony\Component\ErrorCatcher\ErrorHandler; +use Symfony\Component\ErrorCatcher\Exception\FatalThrowableError; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy; diff --git a/src/Symfony/Component/Debug/Debug.php b/src/Symfony/Component/Debug/Debug.php index 20bb579301ebf..87574760856ec 100644 --- a/src/Symfony/Component/Debug/Debug.php +++ b/src/Symfony/Component/Debug/Debug.php @@ -11,9 +11,9 @@ namespace Symfony\Component\Debug; -use Symfony\Component\ErrorHandler\BufferingLogger; -use Symfony\Component\ErrorHandler\ErrorHandler; -use Symfony\Component\ErrorHandler\ExceptionHandler; +use Symfony\Component\ErrorCatcher\BufferingLogger; +use Symfony\Component\ErrorCatcher\ErrorHandler; +use Symfony\Component\ErrorCatcher\ExceptionHandler; /** * Registers all the debug tools. diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php index c5999314980f5..94179f25a56aa 100644 --- a/src/Symfony/Component/Debug/DebugClassLoader.php +++ b/src/Symfony/Component/Debug/DebugClassLoader.php @@ -86,7 +86,7 @@ public function getClassLoader() public static function enable() { // Ensures we don't hit https://bugs.php.net/42098 - class_exists('Symfony\Component\ErrorHandler\ErrorHandler'); + class_exists('Symfony\Component\ErrorCatcher\ErrorHandler'); class_exists('Psr\Log\LogLevel'); if (!\is_array($functions = spl_autoload_functions())) { diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php index 62c916694fca3..68c90c253d84e 100644 --- a/src/Symfony/Component/Debug/ErrorHandler.php +++ b/src/Symfony/Component/Debug/ErrorHandler.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug; -use Symfony\Component\ErrorHandler\ErrorHandler as BaseErrorHandler; +use Symfony\Component\ErrorCatcher\ErrorHandler as BaseErrorHandler; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', ErrorHandler::class, BaseErrorHandler::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\ErrorHandler instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\ErrorHandler instead. */ class ErrorHandler extends BaseErrorHandler { diff --git a/src/Symfony/Component/Debug/Exception/ClassNotFoundException.php b/src/Symfony/Component/Debug/Exception/ClassNotFoundException.php index ac0beab449ba0..4b42cc61e4732 100644 --- a/src/Symfony/Component/Debug/Exception/ClassNotFoundException.php +++ b/src/Symfony/Component/Debug/Exception/ClassNotFoundException.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\Exception; -use Symfony\Component\ErrorHandler\Exception\ClassNotFoundException as BaseClassNotFoundException; +use Symfony\Component\ErrorCatcher\Exception\ClassNotFoundException as BaseClassNotFoundException; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', ClassNotFoundException::class, BaseClassNotFoundException::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\Exception\ClassNotFoundException instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\Exception\ClassNotFoundException instead. */ class ClassNotFoundException extends BaseClassNotFoundException { diff --git a/src/Symfony/Component/Debug/Exception/FatalErrorException.php b/src/Symfony/Component/Debug/Exception/FatalErrorException.php index c203a101a0d63..09a156ad7a218 100644 --- a/src/Symfony/Component/Debug/Exception/FatalErrorException.php +++ b/src/Symfony/Component/Debug/Exception/FatalErrorException.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\Exception; -use Symfony\Component\ErrorHandler\Exception\FatalErrorException as BaseFatalErrorException; +use Symfony\Component\ErrorCatcher\Exception\FatalErrorException as BaseFatalErrorException; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', FatalErrorException::class, BaseFatalErrorException::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\Exception\FatalErrorException instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\Exception\FatalErrorException instead. */ class FatalErrorException extends BaseFatalErrorException { diff --git a/src/Symfony/Component/Debug/Exception/FatalThrowableError.php b/src/Symfony/Component/Debug/Exception/FatalThrowableError.php index f87b6572c8791..6046f1c7cba4f 100644 --- a/src/Symfony/Component/Debug/Exception/FatalThrowableError.php +++ b/src/Symfony/Component/Debug/Exception/FatalThrowableError.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\Exception; -use Symfony\Component\ErrorHandler\Exception\FatalThrowableError as BaseFatalThrowableError; +use Symfony\Component\ErrorCatcher\Exception\FatalThrowableError as BaseFatalThrowableError; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', FatalThrowableError::class, BaseFatalThrowableError::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\Exception\FatalThrowableError instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\Exception\FatalThrowableError instead. */ class FatalThrowableError extends BaseFatalThrowableError { diff --git a/src/Symfony/Component/Debug/Exception/FlattenException.php b/src/Symfony/Component/Debug/Exception/FlattenException.php index aae6b261fea67..70ecd966e48d2 100644 --- a/src/Symfony/Component/Debug/Exception/FlattenException.php +++ b/src/Symfony/Component/Debug/Exception/FlattenException.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\Exception; -use Symfony\Component\ErrorHandler\Exception\FlattenException as BaseFlattenException; +use Symfony\Component\ErrorCatcher\Exception\FlattenException as BaseFlattenException; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', FlattenException::class, BaseFlattenException::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\Exception\FlattenException instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\Exception\FlattenException instead. */ class FlattenException extends BaseFlattenException { diff --git a/src/Symfony/Component/Debug/Exception/OutOfMemoryException.php b/src/Symfony/Component/Debug/Exception/OutOfMemoryException.php index 43502edf9a772..20eb18524287e 100644 --- a/src/Symfony/Component/Debug/Exception/OutOfMemoryException.php +++ b/src/Symfony/Component/Debug/Exception/OutOfMemoryException.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\Exception; -use Symfony\Component\ErrorHandler\Exception\OutOfMemoryException as BaseOutOfMemoryException; +use Symfony\Component\ErrorCatcher\Exception\OutOfMemoryException as BaseOutOfMemoryException; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', OutOfMemoryException::class, BaseOutOfMemoryException::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\Exception\OutOfMemoryException instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\Exception\OutOfMemoryException instead. */ class OutOfMemoryException extends BaseOutOfMemoryException { diff --git a/src/Symfony/Component/Debug/Exception/SilencedErrorContext.php b/src/Symfony/Component/Debug/Exception/SilencedErrorContext.php index 6e617098525a4..2b8ddc2bcb4b1 100644 --- a/src/Symfony/Component/Debug/Exception/SilencedErrorContext.php +++ b/src/Symfony/Component/Debug/Exception/SilencedErrorContext.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\Exception; -use Symfony\Component\ErrorHandler\Exception\SilencedErrorContext as BaseSilencedErrorContext; +use Symfony\Component\ErrorCatcher\Exception\SilencedErrorContext as BaseSilencedErrorContext; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', SilencedErrorContext::class, BaseSilencedErrorContext::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\Exception\SilencedErrorContext instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\Exception\SilencedErrorContext instead. */ class SilencedErrorContext extends BaseSilencedErrorContext { diff --git a/src/Symfony/Component/Debug/Exception/UndefinedFunctionException.php b/src/Symfony/Component/Debug/Exception/UndefinedFunctionException.php index 9bd8517986598..9d509338620f9 100644 --- a/src/Symfony/Component/Debug/Exception/UndefinedFunctionException.php +++ b/src/Symfony/Component/Debug/Exception/UndefinedFunctionException.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\Exception; -use Symfony\Component\ErrorHandler\Exception\UndefinedFunctionException as BaseUndefinedFunctionException; +use Symfony\Component\ErrorCatcher\Exception\UndefinedFunctionException as BaseUndefinedFunctionException; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', UndefinedFunctionException::class, BaseUndefinedFunctionException::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\Exception\UndefinedFunctionException instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\Exception\UndefinedFunctionException instead. */ class UndefinedFunctionException extends BaseUndefinedFunctionException { diff --git a/src/Symfony/Component/Debug/Exception/UndefinedMethodException.php b/src/Symfony/Component/Debug/Exception/UndefinedMethodException.php index 7382488f976ff..0edba8324955e 100644 --- a/src/Symfony/Component/Debug/Exception/UndefinedMethodException.php +++ b/src/Symfony/Component/Debug/Exception/UndefinedMethodException.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\Exception; -use Symfony\Component\ErrorHandler\Exception\UndefinedMethodException as BaseUndefinedMethodException; +use Symfony\Component\ErrorCatcher\Exception\UndefinedMethodException as BaseUndefinedMethodException; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', UndefinedMethodException::class, BaseUndefinedMethodException::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\Exception\UndefinedMethodException instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\Exception\UndefinedMethodException instead. */ class UndefinedMethodException extends BaseUndefinedMethodException { diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php index 9d9097e55dc90..d195319ddf139 100644 --- a/src/Symfony/Component/Debug/ExceptionHandler.php +++ b/src/Symfony/Component/Debug/ExceptionHandler.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug; -use Symfony\Component\ErrorHandler\ExceptionHandler as BaseExceptionHandler; +use Symfony\Component\ErrorCatcher\ExceptionHandler as BaseExceptionHandler; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', ExceptionHandler::class, BaseExceptionHandler::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\ExceptionHandler instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\ExceptionHandler instead. */ class ExceptionHandler extends BaseExceptionHandler { diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php index 476ea001b8122..e7f1285f9802e 100644 --- a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php +++ b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\FatalErrorHandler; -use Symfony\Component\ErrorHandler\FatalErrorHandler\ClassNotFoundFatalErrorHandler as BaseClassNotFoundFatalErrorHandler; +use Symfony\Component\ErrorCatcher\FatalErrorHandler\ClassNotFoundFatalErrorHandler as BaseClassNotFoundFatalErrorHandler; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', ClassNotFoundFatalErrorHandler::class, BaseClassNotFoundFatalErrorHandler::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\FatalErrorHandler\ClassNotFoundFatalErrorHandler instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\FatalErrorHandler\ClassNotFoundFatalErrorHandler instead. */ class ClassNotFoundFatalErrorHandler extends BaseClassNotFoundFatalErrorHandler { diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/FatalErrorHandlerInterface.php b/src/Symfony/Component/Debug/FatalErrorHandler/FatalErrorHandlerInterface.php index d0a04de7610e4..701ebe764061f 100644 --- a/src/Symfony/Component/Debug/FatalErrorHandler/FatalErrorHandlerInterface.php +++ b/src/Symfony/Component/Debug/FatalErrorHandler/FatalErrorHandlerInterface.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\FatalErrorHandler; -use Symfony\Component\ErrorHandler\FatalErrorHandler\FatalErrorHandlerInterface as BaseFatalErrorHandlerInterface; +use Symfony\Component\ErrorCatcher\FatalErrorHandler\FatalErrorHandlerInterface as BaseFatalErrorHandlerInterface; @trigger_error(sprintf('The "%s" interface is deprecated since Symfony 4.4, use "%s" instead.', FatalErrorHandlerInterface::class, BaseFatalErrorHandlerInterface::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\FatalErrorHandler\FatalErrorHandlerInterface instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\FatalErrorHandler\FatalErrorHandlerInterface instead. */ interface FatalErrorHandlerInterface extends BaseFatalErrorHandlerInterface { diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php index ba50d4af9bf73..51015368e0d83 100644 --- a/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php +++ b/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\FatalErrorHandler; -use Symfony\Component\ErrorHandler\FatalErrorHandler\UndefinedFunctionFatalErrorHandler as BaseUndefinedFunctionFatalErrorHandler; +use Symfony\Component\ErrorCatcher\FatalErrorHandler\UndefinedFunctionFatalErrorHandler as BaseUndefinedFunctionFatalErrorHandler; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', UndefinedFunctionFatalErrorHandler::class, BaseUndefinedFunctionFatalErrorHandler::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\FatalErrorHandler\UndefinedFunctionFatalErrorHandler instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\FatalErrorHandler\UndefinedFunctionFatalErrorHandler instead. */ class UndefinedFunctionFatalErrorHandler extends BaseUndefinedFunctionFatalErrorHandler { diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php index 149e07e608fde..9e9164e07f006 100644 --- a/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php +++ b/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php @@ -11,12 +11,12 @@ namespace Symfony\Component\Debug\FatalErrorHandler; -use Symfony\Component\ErrorHandler\FatalErrorHandler\UndefinedMethodFatalErrorHandler as BaseUndefinedMethodFatalErrorHandler; +use Symfony\Component\ErrorCatcher\FatalErrorHandler\UndefinedMethodFatalErrorHandler as BaseUndefinedMethodFatalErrorHandler; @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', UndefinedMethodFatalErrorHandler::class, BaseUndefinedMethodFatalErrorHandler::class), E_USER_DEPRECATED); /** - * @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\FatalErrorHandler\UndefinedMethodFatalErrorHandler instead. + * @deprecated since Symfony 4.4, use Symfony\Component\ErrorCatcher\FatalErrorHandler\UndefinedMethodFatalErrorHandler instead. */ class UndefinedMethodFatalErrorHandler extends BaseUndefinedMethodFatalErrorHandler { diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json index 0dfeee98b3dc7..90f0347e6ff99 100644 --- a/src/Symfony/Component/Debug/composer.json +++ b/src/Symfony/Component/Debug/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^7.1.3", "psr/log": "~1.0", - "symfony/error-handler": "^4.4" + "symfony/error-catcher": "^4.4|^5.0" }, "conflict": { "symfony/http-kernel": "<3.4" diff --git a/src/Symfony/Component/ErrorHandler/.gitignore b/src/Symfony/Component/ErrorCatcher/.gitignore similarity index 100% rename from src/Symfony/Component/ErrorHandler/.gitignore rename to src/Symfony/Component/ErrorCatcher/.gitignore diff --git a/src/Symfony/Component/ErrorHandler/BufferingLogger.php b/src/Symfony/Component/ErrorCatcher/BufferingLogger.php similarity index 94% rename from src/Symfony/Component/ErrorHandler/BufferingLogger.php rename to src/Symfony/Component/ErrorCatcher/BufferingLogger.php index 543c84bfd622b..c0f1c563026af 100644 --- a/src/Symfony/Component/ErrorHandler/BufferingLogger.php +++ b/src/Symfony/Component/ErrorCatcher/BufferingLogger.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler; +namespace Symfony\Component\ErrorCatcher; use Psr\Log\AbstractLogger; diff --git a/src/Symfony/Component/ErrorHandler/CHANGELOG.md b/src/Symfony/Component/ErrorCatcher/CHANGELOG.md similarity index 100% rename from src/Symfony/Component/ErrorHandler/CHANGELOG.md rename to src/Symfony/Component/ErrorCatcher/CHANGELOG.md diff --git a/src/Symfony/Component/ErrorHandler/DependencyInjection/ErrorHandlerPass.php b/src/Symfony/Component/ErrorCatcher/DependencyInjection/ErrorCatcherPass.php similarity index 88% rename from src/Symfony/Component/ErrorHandler/DependencyInjection/ErrorHandlerPass.php rename to src/Symfony/Component/ErrorCatcher/DependencyInjection/ErrorCatcherPass.php index 42beaf6e66862..dd3830f2d30d7 100644 --- a/src/Symfony/Component/ErrorHandler/DependencyInjection/ErrorHandlerPass.php +++ b/src/Symfony/Component/ErrorCatcher/DependencyInjection/ErrorCatcherPass.php @@ -9,23 +9,23 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\DependencyInjection; +namespace Symfony\Component\ErrorCatcher\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\ErrorHandler\ErrorRenderer\ErrorRendererInterface; +use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorRendererInterface; /** * @author Yonel Ceruto */ -class ErrorHandlerPass implements CompilerPassInterface +class ErrorCatcherPass implements CompilerPassInterface { private $rendererService; private $rendererTag; - public function __construct(string $rendererService = 'error_handler.error_renderer', string $rendererTag = 'error_handler.renderer') + public function __construct(string $rendererService = 'error_catcher.error_renderer', string $rendererTag = 'error_catcher.renderer') { $this->rendererService = $rendererService; $this->rendererTag = $rendererTag; diff --git a/src/Symfony/Component/ErrorHandler/DependencyInjection/ErrorRenderer.php b/src/Symfony/Component/ErrorCatcher/DependencyInjection/ErrorRenderer.php similarity index 89% rename from src/Symfony/Component/ErrorHandler/DependencyInjection/ErrorRenderer.php rename to src/Symfony/Component/ErrorCatcher/DependencyInjection/ErrorRenderer.php index dee08fd14c765..ea7d331025db5 100644 --- a/src/Symfony/Component/ErrorHandler/DependencyInjection/ErrorRenderer.php +++ b/src/Symfony/Component/ErrorCatcher/DependencyInjection/ErrorRenderer.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\DependencyInjection; +namespace Symfony\Component\ErrorCatcher\DependencyInjection; use Psr\Container\ContainerInterface; -use Symfony\Component\ErrorHandler\ErrorRenderer\ErrorRenderer as BaseErrorRenderer; +use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorRenderer as BaseErrorRenderer; /** * Lazily loads error renderers from the dependency injection container. diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorCatcher/ErrorHandler.php similarity index 97% rename from src/Symfony/Component/ErrorHandler/ErrorHandler.php rename to src/Symfony/Component/ErrorCatcher/ErrorHandler.php index 08fdc2a3e3e94..635482d42a0a6 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php +++ b/src/Symfony/Component/ErrorCatcher/ErrorHandler.php @@ -9,20 +9,20 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler; +namespace Symfony\Component\ErrorCatcher; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; use Symfony\Component\Debug\DebugClassLoader; -use Symfony\Component\ErrorHandler\Exception\FatalErrorException; -use Symfony\Component\ErrorHandler\Exception\FatalThrowableError; -use Symfony\Component\ErrorHandler\Exception\FlattenException; -use Symfony\Component\ErrorHandler\Exception\OutOfMemoryException; -use Symfony\Component\ErrorHandler\Exception\SilencedErrorContext; -use Symfony\Component\ErrorHandler\FatalErrorHandler\ClassNotFoundFatalErrorHandler; -use Symfony\Component\ErrorHandler\FatalErrorHandler\FatalErrorHandlerInterface; -use Symfony\Component\ErrorHandler\FatalErrorHandler\UndefinedFunctionFatalErrorHandler; -use Symfony\Component\ErrorHandler\FatalErrorHandler\UndefinedMethodFatalErrorHandler; +use Symfony\Component\ErrorCatcher\Exception\FatalErrorException; +use Symfony\Component\ErrorCatcher\Exception\FatalThrowableError; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\Exception\OutOfMemoryException; +use Symfony\Component\ErrorCatcher\Exception\SilencedErrorContext; +use Symfony\Component\ErrorCatcher\FatalErrorHandler\ClassNotFoundFatalErrorHandler; +use Symfony\Component\ErrorCatcher\FatalErrorHandler\FatalErrorHandlerInterface; +use Symfony\Component\ErrorCatcher\FatalErrorHandler\UndefinedFunctionFatalErrorHandler; +use Symfony\Component\ErrorCatcher\FatalErrorHandler\UndefinedMethodFatalErrorHandler; /** * A generic ErrorHandler for the PHP engine. diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/ErrorRenderer.php b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorRenderer.php similarity index 91% rename from src/Symfony/Component/ErrorHandler/ErrorRenderer/ErrorRenderer.php rename to src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorRenderer.php index e5c44127f8243..76b823fb41eb0 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/ErrorRenderer.php +++ b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorRenderer.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\ErrorRenderer; +namespace Symfony\Component\ErrorCatcher\ErrorRenderer; -use Symfony\Component\ErrorHandler\Exception\ErrorRendererNotFoundException; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\Exception\ErrorRendererNotFoundException; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; /** * Renders an Exception that represents a Response content. diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/ErrorRendererInterface.php b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorRendererInterface.php similarity index 86% rename from src/Symfony/Component/ErrorHandler/ErrorRenderer/ErrorRendererInterface.php rename to src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorRendererInterface.php index 0403b292c408c..61c1f61f38231 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/ErrorRendererInterface.php +++ b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorRendererInterface.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\ErrorRenderer; +namespace Symfony\Component\ErrorCatcher\ErrorRenderer; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; /** * Interface implemented by all error renderers. diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/HtmlErrorRenderer.php similarity index 99% rename from src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php rename to src/Symfony/Component/ErrorCatcher/ErrorRenderer/HtmlErrorRenderer.php index 545d1076fb9c5..43ca7dabd6bfa 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php +++ b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/HtmlErrorRenderer.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\ErrorRenderer; +namespace Symfony\Component\ErrorCatcher\ErrorRenderer; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; use Symfony\Component\HttpKernel\Debug\FileLinkFormatter; /** diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/JsonErrorRenderer.php b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/JsonErrorRenderer.php similarity index 89% rename from src/Symfony/Component/ErrorHandler/ErrorRenderer/JsonErrorRenderer.php rename to src/Symfony/Component/ErrorCatcher/ErrorRenderer/JsonErrorRenderer.php index 0c122be65fec8..395ac0f7e39bd 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/JsonErrorRenderer.php +++ b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/JsonErrorRenderer.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\ErrorRenderer; +namespace Symfony\Component\ErrorCatcher\ErrorRenderer; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; /** * @author Yonel Ceruto diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/TxtErrorRenderer.php b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/TxtErrorRenderer.php similarity index 96% rename from src/Symfony/Component/ErrorHandler/ErrorRenderer/TxtErrorRenderer.php rename to src/Symfony/Component/ErrorCatcher/ErrorRenderer/TxtErrorRenderer.php index 629fbe9e73511..e191bbc3fb385 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/TxtErrorRenderer.php +++ b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/TxtErrorRenderer.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\ErrorRenderer; +namespace Symfony\Component\ErrorCatcher\ErrorRenderer; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; /** * @author Yonel Ceruto diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/XmlErrorRenderer.php b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/XmlErrorRenderer.php similarity index 96% rename from src/Symfony/Component/ErrorHandler/ErrorRenderer/XmlErrorRenderer.php rename to src/Symfony/Component/ErrorCatcher/ErrorRenderer/XmlErrorRenderer.php index d9d505aabf71f..158165230f62b 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/XmlErrorRenderer.php +++ b/src/Symfony/Component/ErrorCatcher/ErrorRenderer/XmlErrorRenderer.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\ErrorRenderer; +namespace Symfony\Component\ErrorCatcher\ErrorRenderer; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; /** * @author Yonel Ceruto diff --git a/src/Symfony/Component/ErrorHandler/Exception/ClassNotFoundException.php b/src/Symfony/Component/ErrorCatcher/Exception/ClassNotFoundException.php similarity index 94% rename from src/Symfony/Component/ErrorHandler/Exception/ClassNotFoundException.php rename to src/Symfony/Component/ErrorCatcher/Exception/ClassNotFoundException.php index b0638826d6414..f793f8d55ca6f 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/ClassNotFoundException.php +++ b/src/Symfony/Component/ErrorCatcher/Exception/ClassNotFoundException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Exception; +namespace Symfony\Component\ErrorCatcher\Exception; /** * Class (or Trait or Interface) Not Found Exception. diff --git a/src/Symfony/Component/ErrorHandler/Exception/ErrorRendererNotFoundException.php b/src/Symfony/Component/ErrorCatcher/Exception/ErrorRendererNotFoundException.php similarity index 85% rename from src/Symfony/Component/ErrorHandler/Exception/ErrorRendererNotFoundException.php rename to src/Symfony/Component/ErrorCatcher/Exception/ErrorRendererNotFoundException.php index 45db78a83ee74..05721b0751e89 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/ErrorRendererNotFoundException.php +++ b/src/Symfony/Component/ErrorCatcher/Exception/ErrorRendererNotFoundException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Exception; +namespace Symfony\Component\ErrorCatcher\Exception; class ErrorRendererNotFoundException extends \RuntimeException { diff --git a/src/Symfony/Component/ErrorHandler/Exception/FatalErrorException.php b/src/Symfony/Component/ErrorCatcher/Exception/FatalErrorException.php similarity index 98% rename from src/Symfony/Component/ErrorHandler/Exception/FatalErrorException.php rename to src/Symfony/Component/ErrorCatcher/Exception/FatalErrorException.php index 4269356d5724d..c98e46d5aab8a 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/FatalErrorException.php +++ b/src/Symfony/Component/ErrorCatcher/Exception/FatalErrorException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Exception; +namespace Symfony\Component\ErrorCatcher\Exception; /** * Fatal Error Exception. diff --git a/src/Symfony/Component/ErrorHandler/Exception/FatalThrowableError.php b/src/Symfony/Component/ErrorCatcher/Exception/FatalThrowableError.php similarity index 95% rename from src/Symfony/Component/ErrorHandler/Exception/FatalThrowableError.php rename to src/Symfony/Component/ErrorCatcher/Exception/FatalThrowableError.php index a690c835975f8..86aa298db842d 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/FatalThrowableError.php +++ b/src/Symfony/Component/ErrorCatcher/Exception/FatalThrowableError.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Exception; +namespace Symfony\Component\ErrorCatcher\Exception; /** * Fatal Throwable Error. diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorCatcher/Exception/FlattenException.php similarity index 99% rename from src/Symfony/Component/ErrorHandler/Exception/FlattenException.php rename to src/Symfony/Component/ErrorCatcher/Exception/FlattenException.php index cb63888cd7a5a..27f7ace4bec6e 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php +++ b/src/Symfony/Component/ErrorCatcher/Exception/FlattenException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Exception; +namespace Symfony\Component\ErrorCatcher\Exception; use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Symfony/Component/ErrorHandler/Exception/OutOfMemoryException.php b/src/Symfony/Component/ErrorCatcher/Exception/OutOfMemoryException.php similarity index 87% rename from src/Symfony/Component/ErrorHandler/Exception/OutOfMemoryException.php rename to src/Symfony/Component/ErrorCatcher/Exception/OutOfMemoryException.php index 18c367596f630..ed01e6e661308 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/OutOfMemoryException.php +++ b/src/Symfony/Component/ErrorCatcher/Exception/OutOfMemoryException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Exception; +namespace Symfony\Component\ErrorCatcher\Exception; /** * Out of memory exception. diff --git a/src/Symfony/Component/ErrorHandler/Exception/SilencedErrorContext.php b/src/Symfony/Component/ErrorCatcher/Exception/SilencedErrorContext.php similarity index 96% rename from src/Symfony/Component/ErrorHandler/Exception/SilencedErrorContext.php rename to src/Symfony/Component/ErrorCatcher/Exception/SilencedErrorContext.php index 2c4ae69db419d..46e9b55d7ca24 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/SilencedErrorContext.php +++ b/src/Symfony/Component/ErrorCatcher/Exception/SilencedErrorContext.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Exception; +namespace Symfony\Component\ErrorCatcher\Exception; /** * Data Object that represents a Silenced Error. diff --git a/src/Symfony/Component/ErrorHandler/Exception/UndefinedFunctionException.php b/src/Symfony/Component/ErrorCatcher/Exception/UndefinedFunctionException.php similarity index 94% rename from src/Symfony/Component/ErrorHandler/Exception/UndefinedFunctionException.php rename to src/Symfony/Component/ErrorCatcher/Exception/UndefinedFunctionException.php index bb2f46564d4d7..aef70895c104b 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/UndefinedFunctionException.php +++ b/src/Symfony/Component/ErrorCatcher/Exception/UndefinedFunctionException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Exception; +namespace Symfony\Component\ErrorCatcher\Exception; /** * Undefined Function Exception. diff --git a/src/Symfony/Component/ErrorHandler/Exception/UndefinedMethodException.php b/src/Symfony/Component/ErrorCatcher/Exception/UndefinedMethodException.php similarity index 94% rename from src/Symfony/Component/ErrorHandler/Exception/UndefinedMethodException.php rename to src/Symfony/Component/ErrorCatcher/Exception/UndefinedMethodException.php index 12efdc716c5dc..50a9d1f391d69 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/UndefinedMethodException.php +++ b/src/Symfony/Component/ErrorCatcher/Exception/UndefinedMethodException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Exception; +namespace Symfony\Component\ErrorCatcher\Exception; /** * Undefined Method Exception. diff --git a/src/Symfony/Component/ErrorHandler/ExceptionHandler.php b/src/Symfony/Component/ErrorCatcher/ExceptionHandler.php similarity index 95% rename from src/Symfony/Component/ErrorHandler/ExceptionHandler.php rename to src/Symfony/Component/ErrorCatcher/ExceptionHandler.php index 577ff49230735..63b36d29d4011 100644 --- a/src/Symfony/Component/ErrorHandler/ExceptionHandler.php +++ b/src/Symfony/Component/ErrorCatcher/ExceptionHandler.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler; +namespace Symfony\Component\ErrorCatcher; -use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer; -use Symfony\Component\ErrorHandler\Exception\FlattenException; -use Symfony\Component\ErrorHandler\Exception\OutOfMemoryException; +use Symfony\Component\ErrorCatcher\ErrorRenderer\HtmlErrorRenderer; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\Exception\OutOfMemoryException; use Symfony\Component\HttpKernel\Debug\FileLinkFormatter; /** diff --git a/src/Symfony/Component/ErrorHandler/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/src/Symfony/Component/ErrorCatcher/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php similarity index 97% rename from src/Symfony/Component/ErrorHandler/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php rename to src/Symfony/Component/ErrorCatcher/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php index c84b3e8e4ce74..a9f3e39bb7c90 100644 --- a/src/Symfony/Component/ErrorHandler/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php +++ b/src/Symfony/Component/ErrorCatcher/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php @@ -9,13 +9,13 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\FatalErrorHandler; +namespace Symfony\Component\ErrorCatcher\FatalErrorHandler; use Composer\Autoload\ClassLoader as ComposerClassLoader; use Symfony\Component\ClassLoader\ClassLoader as SymfonyClassLoader; use Symfony\Component\Debug\DebugClassLoader; -use Symfony\Component\ErrorHandler\Exception\ClassNotFoundException; -use Symfony\Component\ErrorHandler\Exception\FatalErrorException; +use Symfony\Component\ErrorCatcher\Exception\ClassNotFoundException; +use Symfony\Component\ErrorCatcher\Exception\FatalErrorException; /** * ErrorHandler for classes that do not exist. diff --git a/src/Symfony/Component/ErrorHandler/FatalErrorHandler/FatalErrorHandlerInterface.php b/src/Symfony/Component/ErrorCatcher/FatalErrorHandler/FatalErrorHandlerInterface.php similarity index 87% rename from src/Symfony/Component/ErrorHandler/FatalErrorHandler/FatalErrorHandlerInterface.php rename to src/Symfony/Component/ErrorCatcher/FatalErrorHandler/FatalErrorHandlerInterface.php index afa8b7d2367d6..6fc237c094263 100644 --- a/src/Symfony/Component/ErrorHandler/FatalErrorHandler/FatalErrorHandlerInterface.php +++ b/src/Symfony/Component/ErrorCatcher/FatalErrorHandler/FatalErrorHandlerInterface.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\FatalErrorHandler; +namespace Symfony\Component\ErrorCatcher\FatalErrorHandler; -use Symfony\Component\ErrorHandler\Exception\FatalErrorException; +use Symfony\Component\ErrorCatcher\Exception\FatalErrorException; /** * Attempts to convert fatal errors to exceptions. diff --git a/src/Symfony/Component/ErrorHandler/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php b/src/Symfony/Component/ErrorCatcher/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php similarity index 93% rename from src/Symfony/Component/ErrorHandler/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php rename to src/Symfony/Component/ErrorCatcher/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php index 9e3affb14dbac..f20cb1185d2ba 100644 --- a/src/Symfony/Component/ErrorHandler/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php +++ b/src/Symfony/Component/ErrorCatcher/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\FatalErrorHandler; +namespace Symfony\Component\ErrorCatcher\FatalErrorHandler; -use Symfony\Component\ErrorHandler\Exception\FatalErrorException; -use Symfony\Component\ErrorHandler\Exception\UndefinedFunctionException; +use Symfony\Component\ErrorCatcher\Exception\FatalErrorException; +use Symfony\Component\ErrorCatcher\Exception\UndefinedFunctionException; /** * ErrorHandler for undefined functions. diff --git a/src/Symfony/Component/ErrorHandler/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/src/Symfony/Component/ErrorCatcher/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php similarity index 91% rename from src/Symfony/Component/ErrorHandler/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php rename to src/Symfony/Component/ErrorCatcher/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php index 49de27446945a..6f9a3eb545d75 100644 --- a/src/Symfony/Component/ErrorHandler/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php +++ b/src/Symfony/Component/ErrorCatcher/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\FatalErrorHandler; +namespace Symfony\Component\ErrorCatcher\FatalErrorHandler; -use Symfony\Component\ErrorHandler\Exception\FatalErrorException; -use Symfony\Component\ErrorHandler\Exception\UndefinedMethodException; +use Symfony\Component\ErrorCatcher\Exception\FatalErrorException; +use Symfony\Component\ErrorCatcher\Exception\UndefinedMethodException; /** * ErrorHandler for undefined methods. diff --git a/src/Symfony/Component/ErrorHandler/LICENSE b/src/Symfony/Component/ErrorCatcher/LICENSE similarity index 100% rename from src/Symfony/Component/ErrorHandler/LICENSE rename to src/Symfony/Component/ErrorCatcher/LICENSE diff --git a/src/Symfony/Component/ErrorHandler/README.md b/src/Symfony/Component/ErrorCatcher/README.md similarity index 80% rename from src/Symfony/Component/ErrorHandler/README.md rename to src/Symfony/Component/ErrorCatcher/README.md index 7b1aa8196711f..7eba105932be0 100644 --- a/src/Symfony/Component/ErrorHandler/README.md +++ b/src/Symfony/Component/ErrorCatcher/README.md @@ -1,7 +1,7 @@ -ErrorHandler Component +ErrorCatcher Component ====================== -The ErrorHandler component provides tools to manage and display errors and exceptions. +The ErrorCatcher component provides tools to manage and display errors and exceptions. Resources --------- diff --git a/src/Symfony/Component/ErrorHandler/Tests/DependencyInjection/ErrorHandlerPassTest.php b/src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/ErrorCatcherPassTest.php similarity index 61% rename from src/Symfony/Component/ErrorHandler/Tests/DependencyInjection/ErrorHandlerPassTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/ErrorCatcherPassTest.php index 3d0b8e429f53e..ed2162b661699 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/DependencyInjection/ErrorHandlerPassTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/ErrorCatcherPassTest.php @@ -9,42 +9,42 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests\DependencyInjection; +namespace Symfony\Component\ErrorCatcher\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\ErrorHandler\DependencyInjection\ErrorHandlerPass; -use Symfony\Component\ErrorHandler\DependencyInjection\ErrorRenderer; -use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer; -use Symfony\Component\ErrorHandler\ErrorRenderer\JsonErrorRenderer; +use Symfony\Component\ErrorCatcher\DependencyInjection\ErrorCatcherPass; +use Symfony\Component\ErrorCatcher\DependencyInjection\ErrorRenderer; +use Symfony\Component\ErrorCatcher\ErrorRenderer\HtmlErrorRenderer; +use Symfony\Component\ErrorCatcher\ErrorRenderer\JsonErrorRenderer; -class ErrorHandlerPassTest extends TestCase +class ErrorPassTest extends TestCase { public function testProcess() { $container = new ContainerBuilder(); $container->setParameter('kernel.debug', true); - $definition = $container->register('error_handler.error_renderer', ErrorRenderer::class) + $definition = $container->register('error_catcher.error_renderer', ErrorRenderer::class) ->addArgument([]) ; - $container->register('error_handler.renderer.html', HtmlErrorRenderer::class) - ->addTag('error_handler.renderer') + $container->register('error_catcher.renderer.html', HtmlErrorRenderer::class) + ->addTag('error_catcher.renderer') ; - $container->register('error_handler.renderer.json', JsonErrorRenderer::class) - ->addTag('error_handler.renderer') + $container->register('error_catcher.renderer.json', JsonErrorRenderer::class) + ->addTag('error_catcher.renderer') ; - (new ErrorHandlerPass())->process($container); + (new ErrorCatcherPass())->process($container); $serviceLocatorDefinition = $container->getDefinition((string) $definition->getArgument(0)); $this->assertSame(ServiceLocator::class, $serviceLocatorDefinition->getClass()); $expected = [ - 'html' => new ServiceClosureArgument(new Reference('error_handler.renderer.html')), - 'json' => new ServiceClosureArgument(new Reference('error_handler.renderer.json')), + 'html' => new ServiceClosureArgument(new Reference('error_catcher.renderer.html')), + 'json' => new ServiceClosureArgument(new Reference('error_catcher.renderer.json')), ]; $this->assertEquals($expected, $serviceLocatorDefinition->getArgument(0)); } diff --git a/src/Symfony/Component/ErrorHandler/Tests/DependencyInjection/ErrorRendererTest.php b/src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/ErrorRendererTest.php similarity index 84% rename from src/Symfony/Component/ErrorHandler/Tests/DependencyInjection/ErrorRendererTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/ErrorRendererTest.php index fcf909fddca54..747cd5069670e 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/DependencyInjection/ErrorRendererTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/ErrorRendererTest.php @@ -9,17 +9,17 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests\DependencyInjection; +namespace Symfony\Component\ErrorCatcher\Tests\DependencyInjection; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorHandler\DependencyInjection\ErrorRenderer; -use Symfony\Component\ErrorHandler\ErrorRenderer\ErrorRendererInterface; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\DependencyInjection\ErrorRenderer; +use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorRendererInterface; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; class ErrorRendererTest extends TestCase { /** - * @expectedException \Symfony\Component\ErrorHandler\Exception\ErrorRendererNotFoundException + * @expectedException \Symfony\Component\ErrorCatcher\Exception\ErrorRendererNotFoundException * @expectedExceptionMessage No error renderer found for format "foo". */ public function testInvalidErrorRenderer() diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorCatcher/Tests/ErrorHandlerTest.php similarity index 97% rename from src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/ErrorHandlerTest.php index 9701558164bc8..d1d845a8665d7 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/ErrorHandlerTest.php @@ -9,16 +9,16 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests; +namespace Symfony\Component\ErrorCatcher\Tests; use PHPUnit\Framework\TestCase; use Psr\Log\LogLevel; use Psr\Log\NullLogger; -use Symfony\Component\ErrorHandler\BufferingLogger; -use Symfony\Component\ErrorHandler\ErrorHandler; -use Symfony\Component\ErrorHandler\Exception\SilencedErrorContext; -use Symfony\Component\ErrorHandler\Tests\Fixtures\ErrorHandlerThatUsesThePreviousOne; -use Symfony\Component\ErrorHandler\Tests\Fixtures\LoggerThatSetAnErrorHandler; +use Symfony\Component\ErrorCatcher\BufferingLogger; +use Symfony\Component\ErrorCatcher\ErrorHandler; +use Symfony\Component\ErrorCatcher\Exception\SilencedErrorContext; +use Symfony\Component\ErrorCatcher\Tests\Fixtures\ErrorHandlerThatUsesThePreviousOne; +use Symfony\Component\ErrorCatcher\Tests\Fixtures\LoggerThatSetAnErrorHandler; /** * ErrorHandlerTest. @@ -33,7 +33,7 @@ public function testRegister() $handler = ErrorHandler::register(); try { - $this->assertInstanceOf('Symfony\Component\ErrorHandler\ErrorHandler', $handler); + $this->assertInstanceOf('Symfony\Component\ErrorCatcher\ErrorHandler', $handler); $this->assertSame($handler, ErrorHandler::register()); $newHandler = new ErrorHandler(); @@ -490,7 +490,7 @@ public function testHandleErrorException() $handler->handleException($exception); - $this->assertInstanceOf('Symfony\Component\ErrorHandler\Exception\ClassNotFoundException', $args[0]); + $this->assertInstanceOf('Symfony\Component\ErrorCatcher\Exception\ClassNotFoundException', $args[0]); $this->assertStringStartsWith("Attempted to load class \"IReallyReallyDoNotExistAnywhereInTheRepositoryISwear\" from the global namespace.\nDid you forget a \"use\" statement", $args[0]->getMessage()); } diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/ErrorRendererTest.php b/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/ErrorRendererTest.php similarity index 80% rename from src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/ErrorRendererTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/ErrorRendererTest.php index 5f77fdc2069d9..156de10c662a0 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/ErrorRendererTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/ErrorRendererTest.php @@ -9,17 +9,17 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests\ErrorRenderer; +namespace Symfony\Component\ErrorCatcher\Tests\ErrorRenderer; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorHandler\ErrorRenderer\ErrorRenderer; -use Symfony\Component\ErrorHandler\ErrorRenderer\ErrorRendererInterface; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorRenderer; +use Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorRendererInterface; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; class ErrorRendererTest extends TestCase { /** - * @expectedException \Symfony\Component\ErrorHandler\Exception\ErrorRendererNotFoundException + * @expectedException \Symfony\Component\ErrorCatcher\Exception\ErrorRendererNotFoundException * @expectedExceptionMessage No error renderer found for format "foo". */ public function testErrorRendererNotFound() @@ -30,7 +30,7 @@ public function testErrorRendererNotFound() /** * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Error renderer "stdClass" must implement "Symfony\Component\ErrorHandler\ErrorRenderer\ErrorRendererInterface". + * @expectedExceptionMessage Error renderer "stdClass" must implement "Symfony\Component\ErrorCatcher\ErrorRenderer\ErrorRendererInterface". */ public function testInvalidErrorRenderer() { diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/HtmlErrorRendererTest.php b/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/HtmlErrorRendererTest.php similarity index 80% rename from src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/HtmlErrorRendererTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/HtmlErrorRendererTest.php index a380de4ab9628..3054e28510bc2 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/HtmlErrorRendererTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/HtmlErrorRendererTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests\ErrorRenderer; +namespace Symfony\Component\ErrorCatcher\Tests\ErrorRenderer; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\ErrorRenderer\HtmlErrorRenderer; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; class HtmlErrorRendererTest extends TestCase { diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/JsonErrorRendererTest.php b/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/JsonErrorRendererTest.php similarity index 78% rename from src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/JsonErrorRendererTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/JsonErrorRendererTest.php index 7bfc048402767..bbc754f9094ba 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/JsonErrorRendererTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/JsonErrorRendererTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests\ErrorRenderer; +namespace Symfony\Component\ErrorCatcher\Tests\ErrorRenderer; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorHandler\ErrorRenderer\JsonErrorRenderer; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\ErrorRenderer\JsonErrorRenderer; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; class JsonErrorRendererTest extends TestCase { diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/TxtErrorRendererTest.php b/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/TxtErrorRendererTest.php similarity index 77% rename from src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/TxtErrorRendererTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/TxtErrorRendererTest.php index d48d924ad97d1..b3c817581ca19 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/TxtErrorRendererTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/TxtErrorRendererTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests\ErrorRenderer; +namespace Symfony\Component\ErrorCatcher\Tests\ErrorRenderer; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorHandler\ErrorRenderer\TxtErrorRenderer; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\ErrorRenderer\TxtErrorRenderer; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; class TxtErrorRendererTest extends TestCase { diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/XmlErrorRendererTest.php b/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/XmlErrorRendererTest.php similarity index 79% rename from src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/XmlErrorRendererTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/XmlErrorRendererTest.php index 4bed569c1be97..f98e43920ab22 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/XmlErrorRendererTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/XmlErrorRendererTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests\ErrorRenderer; +namespace Symfony\Component\ErrorCatcher\Tests\ErrorRenderer; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorHandler\ErrorRenderer\XmlErrorRenderer; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\ErrorRenderer\XmlErrorRenderer; +use Symfony\Component\ErrorCatcher\Exception\FlattenException; class XmlErrorRendererTest extends TestCase { diff --git a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/ErrorCatcher/Tests/Exception/FlattenExceptionTest.php similarity index 98% rename from src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/Exception/FlattenExceptionTest.php index a9c717e309ec8..c6d99662d2893 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/Exception/FlattenExceptionTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests\Exception; +namespace Symfony\Component\ErrorCatcher\Tests\Exception; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorHandler\Exception\FatalThrowableError; -use Symfony\Component\ErrorHandler\Exception\FlattenException; +use Symfony\Component\ErrorCatcher\Exception\FatalThrowableError; +use Symfony\Component\ErrorCatcher\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/ErrorHandler/Tests/ExceptionHandlerTest.php b/src/Symfony/Component/ErrorCatcher/Tests/ExceptionHandlerTest.php similarity index 93% rename from src/Symfony/Component/ErrorHandler/Tests/ExceptionHandlerTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/ExceptionHandlerTest.php index 03c39d36860d9..d3b8deec80c4d 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/ExceptionHandlerTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/ExceptionHandlerTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests; +namespace Symfony\Component\ErrorCatcher\Tests; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorHandler\Exception\OutOfMemoryException; -use Symfony\Component\ErrorHandler\ExceptionHandler; +use Symfony\Component\ErrorCatcher\Exception\OutOfMemoryException; +use Symfony\Component\ErrorCatcher\ExceptionHandler; use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -110,7 +110,7 @@ public function testHandle() { $exception = new \Exception('foo'); - $handler = $this->getMockBuilder('Symfony\Component\ErrorHandler\ExceptionHandler')->setMethods(['sendPhpResponse'])->getMock(); + $handler = $this->getMockBuilder('Symfony\Component\ErrorCatcher\ExceptionHandler')->setMethods(['sendPhpResponse'])->getMock(); $handler ->expects($this->exactly(2)) ->method('sendPhpResponse'); @@ -128,7 +128,7 @@ public function testHandleOutOfMemoryException() { $exception = new OutOfMemoryException('foo', 0, E_ERROR, __FILE__, __LINE__); - $handler = $this->getMockBuilder('Symfony\Component\ErrorHandler\ExceptionHandler')->setMethods(['sendPhpResponse'])->getMock(); + $handler = $this->getMockBuilder('Symfony\Component\ErrorCatcher\ExceptionHandler')->setMethods(['sendPhpResponse'])->getMock(); $handler ->expects($this->once()) ->method('sendPhpResponse'); diff --git a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/src/Symfony/Component/ErrorCatcher/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php similarity index 89% rename from src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php index 2fdec8dcf5ac3..0d02f6ca93da6 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php @@ -9,13 +9,13 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests\FatalErrorHandler; +namespace Symfony\Component\ErrorCatcher\Tests\FatalErrorHandler; use Composer\Autoload\ClassLoader as ComposerClassLoader; use PHPUnit\Framework\TestCase; use Symfony\Component\Debug\DebugClassLoader; -use Symfony\Component\ErrorHandler\Exception\FatalErrorException; -use Symfony\Component\ErrorHandler\FatalErrorHandler\ClassNotFoundFatalErrorHandler; +use Symfony\Component\ErrorCatcher\Exception\FatalErrorException; +use Symfony\Component\ErrorCatcher\FatalErrorHandler\ClassNotFoundFatalErrorHandler; class ClassNotFoundFatalErrorHandlerTest extends TestCase { @@ -32,7 +32,7 @@ public static function setUpBeforeClass() } if ($function[0] instanceof ComposerClassLoader) { - $function[0]->add('Symfony_Component_ErrorHandler_Tests_Fixtures', \dirname(\dirname(\dirname(\dirname(\dirname(__DIR__)))))); + $function[0]->add('Symfony_Component_ErrorCatcher_Tests_Fixtures', \dirname(\dirname(\dirname(\dirname(\dirname(__DIR__)))))); break; } } @@ -60,7 +60,7 @@ public function testHandleClassNotFound($error, $translatedMessage, $autoloader array_map('spl_autoload_register', $autoloaders); } - $this->assertInstanceOf('Symfony\Component\ErrorHandler\Exception\ClassNotFoundException', $exception); + $this->assertInstanceOf('Symfony\Component\ErrorCatcher\Exception\ClassNotFoundException', $exception); $this->assertSame($translatedMessage, $exception->getMessage()); $this->assertSame($error['type'], $exception->getSeverity()); $this->assertSame($error['file'], $exception->getFile()); @@ -70,7 +70,7 @@ public function testHandleClassNotFound($error, $translatedMessage, $autoloader public function provideClassNotFoundData() { $autoloader = new ComposerClassLoader(); - $autoloader->add('Symfony\Component\ErrorHandler\Exception\\', realpath(__DIR__.'/../../Exception')); + $autoloader->add('Symfony\Component\ErrorCatcher\Exception\\', realpath(__DIR__.'/../../Exception')); $debugClassLoader = new DebugClassLoader([$autoloader, 'loadClass']); @@ -100,7 +100,7 @@ public function provideClassNotFoundData() 'file' => 'foo.php', 'message' => 'Class \'UndefinedFuncException\' not found', ], - "Attempted to load class \"UndefinedFuncException\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony\Component\ErrorHandler\Tests\Fixtures\UndefinedFuncException\"?", + "Attempted to load class \"UndefinedFuncException\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony\Component\ErrorCatcher\Tests\Fixtures\UndefinedFuncException\"?", ], [ [ @@ -109,7 +109,7 @@ public function provideClassNotFoundData() 'file' => 'foo.php', 'message' => 'Class \'PEARClass\' not found', ], - "Attempted to load class \"PEARClass\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony_Component_ErrorHandler_Tests_Fixtures_PEARClass\"?", + "Attempted to load class \"PEARClass\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony_Component_ErrorCatcher_Tests_Fixtures_PEARClass\"?", ], [ [ @@ -118,7 +118,7 @@ public function provideClassNotFoundData() 'file' => 'foo.php', 'message' => 'Class \'Foo\\Bar\\UndefinedFuncException\' not found', ], - "Attempted to load class \"UndefinedFuncException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\ErrorHandler\Tests\Fixtures\UndefinedFuncException\"?", + "Attempted to load class \"UndefinedFuncException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\ErrorCatcher\Tests\Fixtures\UndefinedFuncException\"?", ], [ [ @@ -127,7 +127,7 @@ public function provideClassNotFoundData() 'file' => 'foo.php', 'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found', ], - "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\ErrorHandler\Exception\UndefinedFunctionException\"?", + "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\ErrorCatcher\Exception\UndefinedFunctionException\"?", [$autoloader, 'loadClass'], ], [ @@ -137,7 +137,7 @@ public function provideClassNotFoundData() 'file' => 'foo.php', 'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found', ], - "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\ErrorHandler\Exception\UndefinedFunctionException\"?", + "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\ErrorCatcher\Exception\UndefinedFunctionException\"?", [$debugClassLoader, 'loadClass'], ], [ @@ -171,6 +171,6 @@ public function testCannotRedeclareClass() $handler = new ClassNotFoundFatalErrorHandler(); $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line'])); - $this->assertInstanceOf('Symfony\Component\ErrorHandler\Exception\ClassNotFoundException', $exception); + $this->assertInstanceOf('Symfony\Component\ErrorCatcher\Exception\ClassNotFoundException', $exception); } } diff --git a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php b/src/Symfony/Component/ErrorCatcher/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php similarity index 87% rename from src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php index c24109b1b3525..cf8a5fc319ee3 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests\FatalErrorHandler; +namespace Symfony\Component\ErrorCatcher\Tests\FatalErrorHandler; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorHandler\Exception\FatalErrorException; -use Symfony\Component\ErrorHandler\FatalErrorHandler\UndefinedFunctionFatalErrorHandler; +use Symfony\Component\ErrorCatcher\Exception\FatalErrorException; +use Symfony\Component\ErrorCatcher\FatalErrorHandler\UndefinedFunctionFatalErrorHandler; class UndefinedFunctionFatalErrorHandlerTest extends TestCase { @@ -25,7 +25,7 @@ public function testUndefinedFunction($error, $translatedMessage) $handler = new UndefinedFunctionFatalErrorHandler(); $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line'])); - $this->assertInstanceOf('Symfony\Component\ErrorHandler\Exception\UndefinedFunctionException', $exception); + $this->assertInstanceOf('Symfony\Component\ErrorCatcher\Exception\UndefinedFunctionException', $exception); // class names are case insensitive and PHP do not return the same $this->assertSame(strtolower($translatedMessage), strtolower($exception->getMessage())); $this->assertSame($error['type'], $exception->getSeverity()); @@ -43,7 +43,7 @@ public function provideUndefinedFunctionData() 'file' => 'foo.php', 'message' => 'Call to undefined function test_namespaced_function()', ], - "Attempted to call function \"test_namespaced_function\" from the global namespace.\nDid you mean to call \"\\symfony\\component\\errorhandler\\tests\\fatalerrorhandler\\test_namespaced_function\"?", + "Attempted to call function \"test_namespaced_function\" from the global namespace.\nDid you mean to call \"\\symfony\\component\\errorcatcher\\tests\\fatalerrorhandler\\test_namespaced_function\"?", ], [ [ @@ -52,7 +52,7 @@ public function provideUndefinedFunctionData() 'file' => 'foo.php', 'message' => 'Call to undefined function Foo\\Bar\\Baz\\test_namespaced_function()', ], - "Attempted to call function \"test_namespaced_function\" from namespace \"Foo\\Bar\\Baz\".\nDid you mean to call \"\\symfony\\component\\errorhandler\\tests\\fatalerrorhandler\\test_namespaced_function\"?", + "Attempted to call function \"test_namespaced_function\" from namespace \"Foo\\Bar\\Baz\".\nDid you mean to call \"\\symfony\\component\\errorcatcher\\tests\\fatalerrorhandler\\test_namespaced_function\"?", ], [ [ diff --git a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/src/Symfony/Component/ErrorCatcher/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php similarity index 91% rename from src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php rename to src/Symfony/Component/ErrorCatcher/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php index b91792b440329..0f0c9c5f2de65 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\ErrorHandler\Tests\FatalErrorHandler; +namespace Symfony\Component\ErrorCatcher\Tests\FatalErrorHandler; use PHPUnit\Framework\TestCase; -use Symfony\Component\ErrorHandler\Exception\FatalErrorException; -use Symfony\Component\ErrorHandler\FatalErrorHandler\UndefinedMethodFatalErrorHandler; +use Symfony\Component\ErrorCatcher\Exception\FatalErrorException; +use Symfony\Component\ErrorCatcher\FatalErrorHandler\UndefinedMethodFatalErrorHandler; class UndefinedMethodFatalErrorHandlerTest extends TestCase { @@ -25,7 +25,7 @@ public function testUndefinedMethod($error, $translatedMessage) $handler = new UndefinedMethodFatalErrorHandler(); $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line'])); - $this->assertInstanceOf('Symfony\Component\ErrorHandler\Exception\UndefinedMethodException', $exception); + $this->assertInstanceOf('Symfony\Component\ErrorCatcher\Exception\UndefinedMethodException', $exception); $this->assertSame($translatedMessage, $exception->getMessage()); $this->assertSame($error['type'], $exception->getSeverity()); $this->assertSame($error['file'], $exception->getFile()); diff --git a/src/Symfony/Component/ErrorHandler/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php b/src/Symfony/Component/ErrorCatcher/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php similarity index 88% rename from src/Symfony/Component/ErrorHandler/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php rename to src/Symfony/Component/ErrorCatcher/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php index 7cc51ff3229f5..c3c477fbf5465 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php +++ b/src/Symfony/Component/ErrorCatcher/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php @@ -1,6 +1,6 @@ --EXPECTF-- -object(Symfony\Component\ErrorHandler\Exception\ClassNotFoundException)#%d (8) { +object(Symfony\Component\ErrorCatcher\Exception\ClassNotFoundException)#%d (8) { ["message":protected]=> - string(138) "Attempted to load class "missing" from namespace "Symfony\Component\ErrorHandler". + string(138) "Attempted to load class "missing" from namespace "Symfony\Component\ErrorCatcher". Did you forget a "use" statement for another namespace?" ["string":"Exception":private]=> string(0) "" diff --git a/src/Symfony/Component/ErrorHandler/Tests/phpt/exception_rethrown.phpt b/src/Symfony/Component/ErrorCatcher/Tests/phpt/exception_rethrown.phpt similarity index 94% rename from src/Symfony/Component/ErrorHandler/Tests/phpt/exception_rethrown.phpt rename to src/Symfony/Component/ErrorCatcher/Tests/phpt/exception_rethrown.phpt index 82a9006d840f9..df3495c991c55 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/phpt/exception_rethrown.phpt +++ b/src/Symfony/Component/ErrorCatcher/Tests/phpt/exception_rethrown.phpt @@ -3,7 +3,7 @@ Test rethrowing in custom exception handler --FILE-- string(37) "Error and exception handlers do match" } -object(Symfony\Component\ErrorHandler\Exception\FatalErrorException)#%d (%d) { +object(Symfony\Component\ErrorCatcher\Exception\FatalErrorException)#%d (%d) { ["message":protected]=> - string(186) "Error: Class Symfony\Component\ErrorHandler\Broken contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (JsonSerializable::jsonSerialize)" + string(186) "Error: Class Symfony\Component\ErrorCatcher\Broken contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (JsonSerializable::jsonSerialize)" %a } diff --git a/src/Symfony/Component/ErrorHandler/composer.json b/src/Symfony/Component/ErrorCatcher/composer.json similarity index 84% rename from src/Symfony/Component/ErrorHandler/composer.json rename to src/Symfony/Component/ErrorCatcher/composer.json index 0b905712024b6..42579d087bc45 100644 --- a/src/Symfony/Component/ErrorHandler/composer.json +++ b/src/Symfony/Component/ErrorCatcher/composer.json @@ -1,7 +1,7 @@ { - "name": "symfony/error-handler", + "name": "symfony/error-catcher", "type": "library", - "description": "Symfony ErrorHandler Component", + "description": "Symfony ErrorCatcher Component", "keywords": [], "homepage": "https://symfony.com", "license": "MIT", @@ -28,7 +28,7 @@ "symfony/http-kernel": "<4.4" }, "autoload": { - "psr-4": { "Symfony\\Component\\ErrorHandler\\": "" }, + "psr-4": { "Symfony\\Component\\ErrorCatcher\\": "" }, "exclude-from-classmap": [ "/Tests/" ] diff --git a/src/Symfony/Component/ErrorHandler/phpunit.xml.dist b/src/Symfony/Component/ErrorCatcher/phpunit.xml.dist similarity index 92% rename from src/Symfony/Component/ErrorHandler/phpunit.xml.dist rename to src/Symfony/Component/ErrorCatcher/phpunit.xml.dist index 494bb652f4d03..c5274e736fad5 100644 --- a/src/Symfony/Component/ErrorHandler/phpunit.xml.dist +++ b/src/Symfony/Component/ErrorCatcher/phpunit.xml.dist @@ -13,7 +13,7 @@ - + ./Tests/ diff --git a/src/Symfony/Component/ErrorHandler/Tests/Fixtures/PEARClass.php b/src/Symfony/Component/ErrorHandler/Tests/Fixtures/PEARClass.php deleted file mode 100644 index 67620eba1c233..0000000000000 --- a/src/Symfony/Component/ErrorHandler/Tests/Fixtures/PEARClass.php +++ /dev/null @@ -1,5 +0,0 @@ - ['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\ErrorHandler\Exception\SilencedErrorContext' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castSilencedErrorContext'], + 'Symfony\Component\ErrorCatcher\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'],