diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature #32470 Rename ErrorCatcher to ErrorRenderer (rendering part only) (yceruto)

Browse Source 
This PR was squashed before being merged into the 4.4 branch (closes #32470).

Discussion
----------

Rename ErrorCatcher to ErrorRenderer (rendering part only)

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Follow up https://github.com/symfony/symfony/pull/32377

Commits
-------

fb5b0429b2 Rename ErrorCatcher to ErrorRenderer (rendering part only)
This commit is contained in:
Nicolas Grekas 2019-07-11 10:47:06 +02:00
commit 4499e2a21a
51 changed files with 151 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -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');

4
src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
View File

@ -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);

2
src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
View File

@ -22,7 +22,7 @@
<argument type="service" id="debug.file_link_formatter" />
<argument>%kernel.debug%</argument>
<argument>%kernel.charset%</argument>
<argument type="service" id="error_catcher.error_formatter" on-invalid="null" />
<argument type="service" id="error_renderer" on-invalid="null" />
</service>
<service id="debug.file_link_formatter" class="Symfony\Component\HttpKernel\Debug\FileLinkFormatter">

37
src/Symfony/Bundle/FrameworkBundle/Resources/config/error_catcher.xml
View File

@ -1,37 +0,0 @@
<?xml version="1.0" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="error_catcher.error_formatter" class="Symfony\Component\ErrorCatcher\DependencyInjection\LazyLoadingErrorFormatter">
<argument /> <!-- error renderer locator -->
</service>
<service id="error_catcher.renderer.html" class="Symfony\Component\ErrorCatcher\ErrorRenderer\HtmlErrorRenderer">
<tag name="error_catcher.renderer" />
<argument>%kernel.debug%</argument>
<argument>%kernel.charset%</argument>
<argument>%debug.file_link_format%</argument>
</service>
<service id="error_catcher.renderer.json" class="Symfony\Component\ErrorCatcher\ErrorRenderer\JsonErrorRenderer">
<tag name="error_catcher.renderer" />
<argument>%kernel.debug%</argument>
</service>
<service id="error_catcher.renderer.xml" class="Symfony\Component\ErrorCatcher\ErrorRenderer\XmlErrorRenderer">
<tag name="error_catcher.renderer" format="atom" />
<tag name="error_catcher.renderer" />
<argument>%kernel.debug%</argument>
<argument>%kernel.charset%</argument>
</service>
<service id="error_catcher.renderer.txt" class="Symfony\Component\ErrorCatcher\ErrorRenderer\TxtErrorRenderer">
<tag name="error_catcher.renderer" />
<argument>%kernel.debug%</argument>
<argument>%kernel.charset%</argument>
</service>
</services>
</container>

37
src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="error_renderer" class="Symfony\Component\ErrorRenderer\DependencyInjection\LazyLoadingErrorRenderer">
<argument /> <!-- error renderer locator -->
</service>
<service id="error_renderer.renderer.html" class="Symfony\Component\ErrorRenderer\ErrorRenderer\HtmlErrorRenderer">
<tag name="error_renderer.renderer" />
<argument>%kernel.debug%</argument>
<argument>%kernel.charset%</argument>
<argument>%debug.file_link_format%</argument>
</service>
<service id="error_renderer.renderer.json" class="Symfony\Component\ErrorRenderer\ErrorRenderer\JsonErrorRenderer">
<tag name="error_renderer.renderer" />
<argument>%kernel.debug%</argument>
</service>
<service id="error_renderer.renderer.xml" class="Symfony\Component\ErrorRenderer\ErrorRenderer\XmlErrorRenderer">
<tag name="error_renderer.renderer" format="atom" />
<tag name="error_renderer.renderer" />
<argument>%kernel.debug%</argument>
<argument>%kernel.charset%</argument>
</service>
<service id="error_renderer.renderer.txt" class="Symfony\Component\ErrorRenderer\ErrorRenderer\TxtErrorRenderer">
<tag name="error_renderer.renderer" />
<argument>%kernel.debug%</argument>
<argument>%kernel.charset%</argument>
</service>
</services>
</container>

2
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -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",

2
src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
View File

@ -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;

2
src/Symfony/Bundle/TwigBundle/Controller/PreviewErrorController.php
View File

@ -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;

2
src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php
View File

@ -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');

2
src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
View File

@ -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;

2
src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php
View File

@ -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;

2
src/Symfony/Bundle/TwigBundle/composer.json
View File

@ -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",

2
src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
View File

@ -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;

2
src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
View File

@ -27,7 +27,7 @@
<argument type="service" id="twig" />
<argument>%kernel.debug%</argument>
<argument type="service" id="debug.file_link_formatter" />
<argument type="service" id="error_catcher.renderer.html" on-invalid="null" />
<argument type="service" id="error_renderer.renderer.html" on-invalid="null" />
</service>
<service id="web_profiler.csp.handler" class="Symfony\Bundle\WebProfilerBundle\Csp\ContentSecurityPolicyHandler">

4
src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
View File

@ -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);

2
src/Symfony/Component/Debug/CHANGELOG.md
View File

@ -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
-----

8
src/Symfony/Component/Debug/Exception/FlattenException.php
View File

@ -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 <fabien@symfony.com>
*
* @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);
}

0
src/Symfony/Component/ErrorCatcher/.gitignore → src/Symfony/Component/ErrorRenderer/.gitignore vendored
View File

0
src/Symfony/Component/ErrorCatcher/CHANGELOG.md → src/Symfony/Component/ErrorRenderer/CHANGELOG.md
View File

8
src/Symfony/Component/ErrorCatcher/DependencyInjection/ErrorCatcherPass.php → src/Symfony/Component/ErrorRenderer/DependencyInjection/ErrorRendererPass.php
View File

@ -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 <yonelceruto@gmail.com>
*/
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;

6
src/Symfony/Component/ErrorCatcher/DependencyInjection/LazyLoadingErrorFormatter.php → src/Symfony/Component/ErrorRenderer/DependencyInjection/LazyLoadingErrorRenderer.php
View File

@ -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 <yonelceruto@gmail.com>
*/
class LazyLoadingErrorFormatter extends ErrorFormatter
class LazyLoadingErrorRenderer extends ErrorRenderer
{
private $container;
private $initialized = [];

9
src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorFormatter.php → src/Symfony/Component/ErrorRenderer/ErrorRenderer.php
View File

@ -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 <yonelceruto@gmail.com>
*/
class ErrorFormatter
class ErrorRenderer
{
private $renderers = [];

4
src/Symfony/Component/ErrorCatcher/ErrorRenderer/ErrorRendererInterface.php → src/Symfony/Component/ErrorRenderer/ErrorRenderer/ErrorRendererInterface.php
View File

@ -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.

4
src/Symfony/Component/ErrorCatcher/ErrorRenderer/HtmlErrorRenderer.php → src/Symfony/Component/ErrorRenderer/ErrorRenderer/HtmlErrorRenderer.php
View File

@ -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;
/**

4
src/Symfony/Component/ErrorCatcher/ErrorRenderer/JsonErrorRenderer.php → src/Symfony/Component/ErrorRenderer/ErrorRenderer/JsonErrorRenderer.php
View File

@ -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 <yonelceruto@gmail.com>

4
src/Symfony/Component/ErrorCatcher/ErrorRenderer/TxtErrorRenderer.php → src/Symfony/Component/ErrorRenderer/ErrorRenderer/TxtErrorRenderer.php
View File

@ -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 <yonelceruto@gmail.com>

4
src/Symfony/Component/ErrorCatcher/ErrorRenderer/XmlErrorRenderer.php → src/Symfony/Component/ErrorRenderer/ErrorRenderer/XmlErrorRenderer.php
View File

@ -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 <yonelceruto@gmail.com>

2
src/Symfony/Component/ErrorCatcher/Exception/ErrorRendererNotFoundException.php → src/Symfony/Component/ErrorRenderer/Exception/ErrorRendererNotFoundException.php
View File

@ -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
{

2
src/Symfony/Component/ErrorCatcher/Exception/FlattenException.php → src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php
View File

@ -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;

0
src/Symfony/Component/ErrorCatcher/LICENSE → src/Symfony/Component/ErrorRenderer/LICENSE
View File

4
src/Symfony/Component/ErrorCatcher/README.md → src/Symfony/Component/ErrorRenderer/README.md
View File

@ -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
---------

28
src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/ErrorCatcherPassTest.php → src/Symfony/Component/ErrorRenderer/Tests/DependencyInjection/ErrorRendererPassTest.php
View File

@ -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));
}

16
src/Symfony/Component/ErrorCatcher/Tests/DependencyInjection/LazyLoadingErrorFormatterTest.php → src/Symfony/Component/ErrorRenderer/Tests/DependencyInjection/LazyLoadingErrorRendererTest.php
View File

@ -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'));

6
src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/HtmlErrorRendererTest.php → src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/HtmlErrorRendererTest.php
View File

@ -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
{

6
src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/JsonErrorRendererTest.php → src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/JsonErrorRendererTest.php
View File

@ -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
{

6
src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/TxtErrorRendererTest.php → src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/TxtErrorRendererTest.php
View File

@ -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
{

6
src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/XmlErrorRendererTest.php → src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/XmlErrorRendererTest.php
View File

@ -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
{

18
src/Symfony/Component/ErrorCatcher/Tests/ErrorRenderer/ErrorFormatterTest.php → src/Symfony/Component/ErrorRenderer/Tests/ErrorRendererTest.php
View File

@ -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'));

4
src/Symfony/Component/ErrorCatcher/Tests/Exception/FlattenExceptionTest.php → src/Symfony/Component/ErrorRenderer/Tests/Exception/FlattenExceptionTest.php
View File

@ -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;

6
src/Symfony/Component/ErrorCatcher/composer.json → src/Symfony/Component/ErrorRenderer/composer.json
View File

@ -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/"
]

2
src/Symfony/Component/ErrorCatcher/phpunit.xml.dist → src/Symfony/Component/ErrorRenderer/phpunit.xml.dist
View File

@ -13,7 +13,7 @@
</php>
<testsuites>
<testsuite name="Symfony ErrorCatcher Component Test Suite">
<testsuite name="Symfony ErrorRenderer Component Test Suite">
<directory>./Tests/</directory>
</testsuite>
</testsuites>

2
src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
View File

@ -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;

20
src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
View File

@ -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());
}
};

2
src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
View File

@ -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;

2
src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php
View File

@ -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;

2
src/Symfony/Component/HttpKernel/composer.json
View File

@ -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",

2
src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
View File

@ -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;

2
src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php
View File

@ -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;
/**

2
src/Symfony/Component/Messenger/Tests/Stamp/RedeliveryStampTest.php
View File

@ -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

2
src/Symfony/Component/Messenger/composer.json
View File

@ -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",

2
src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
View File

@ -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'],