Skip to content

Commit 91197d2

Browse files
feature #32470 Rename ErrorCatcher to ErrorRenderer (rendering part only) (yceruto)
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 symfony/symfony#32377 Commits ------- fb5b0429b2 Rename ErrorCatcher to ErrorRenderer (rendering part only)
2 parents 1187683 + 26995ce commit 91197d2

File tree

6 files changed

+42
-42
lines changed

6 files changed

+42
-42
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public function load(array $configs, ContainerBuilder $container)
154154
$loader->load('web.xml');
155155
$loader->load('services.xml');
156156
$loader->load('fragment_renderer.xml');
157-
$loader->load('error_catcher.xml');
157+
$loader->load('error_renderer.xml');
158158

159159
if (interface_exists(PsrEventDispatcherInterface::class)) {
160160
$container->setAlias(PsrEventDispatcherInterface::class, 'event_dispatcher');

FrameworkBundle.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
use Symfony\Component\DependencyInjection\Compiler\PassConfig;
3434
use Symfony\Component\DependencyInjection\Compiler\RegisterReverseContainerPass;
3535
use Symfony\Component\DependencyInjection\ContainerBuilder;
36-
use Symfony\Component\ErrorCatcher\DependencyInjection\ErrorCatcherPass;
36+
use Symfony\Component\ErrorRenderer\DependencyInjection\ErrorRendererPass;
3737
use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
3838
use Symfony\Component\Form\DependencyInjection\FormPass;
3939
use Symfony\Component\HttpFoundation\Request;
@@ -91,7 +91,7 @@ public function build(ContainerBuilder $container)
9191
KernelEvents::FINISH_REQUEST,
9292
];
9393

94-
$container->addCompilerPass(new ErrorCatcherPass());
94+
$container->addCompilerPass(new ErrorRendererPass());
9595
$container->addCompilerPass(new LoggerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
9696
$container->addCompilerPass(new RegisterControllerArgumentLocatorsPass());
9797
$container->addCompilerPass(new RemoveEmptyControllerArgumentLocatorsPass(), PassConfig::TYPE_BEFORE_REMOVING);

Resources/config/debug_prod.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<argument type="service" id="debug.file_link_formatter" />
2323
<argument>%kernel.debug%</argument>
2424
<argument>%kernel.charset%</argument>
25-
<argument type="service" id="error_catcher.error_formatter" on-invalid="null" />
25+
<argument type="service" id="error_renderer" on-invalid="null" />
2626
</service>
2727

2828
<service id="debug.file_link_formatter" class="Symfony\Component\HttpKernel\Debug\FileLinkFormatter">

Resources/config/error_catcher.xml

Lines changed: 0 additions & 37 deletions
This file was deleted.

Resources/config/error_renderer.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" ?>
2+
3+
<container xmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
6+
7+
<services>
8+
<service id="error_renderer" class="Symfony\Component\ErrorRenderer\DependencyInjection\LazyLoadingErrorRenderer">
9+
<argument /> <!-- error renderer locator -->
10+
</service>
11+
12+
<service id="error_renderer.renderer.html" class="Symfony\Component\ErrorRenderer\ErrorRenderer\HtmlErrorRenderer">
13+
<tag name="error_renderer.renderer" />
14+
<argument>%kernel.debug%</argument>
15+
<argument>%kernel.charset%</argument>
16+
<argument>%debug.file_link_format%</argument>
17+
</service>
18+
19+
<service id="error_renderer.renderer.json" class="Symfony\Component\ErrorRenderer\ErrorRenderer\JsonErrorRenderer">
20+
<tag name="error_renderer.renderer" />
21+
<argument>%kernel.debug%</argument>
22+
</service>
23+
24+
<service id="error_renderer.renderer.xml" class="Symfony\Component\ErrorRenderer\ErrorRenderer\XmlErrorRenderer">
25+
<tag name="error_renderer.renderer" format="atom" />
26+
<tag name="error_renderer.renderer" />
27+
<argument>%kernel.debug%</argument>
28+
<argument>%kernel.charset%</argument>
29+
</service>
30+
31+
<service id="error_renderer.renderer.txt" class="Symfony\Component\ErrorRenderer\ErrorRenderer\TxtErrorRenderer">
32+
<tag name="error_renderer.renderer" />
33+
<argument>%kernel.debug%</argument>
34+
<argument>%kernel.charset%</argument>
35+
</service>
36+
</services>
37+
</container>

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/cache": "^4.4|^5.0",
2222
"symfony/config": "^4.2|^5.0",
2323
"symfony/dependency-injection": "^4.4|^5.0",
24-
"symfony/error-catcher": "^4.4|^5.0",
24+
"symfony/error-renderer": "^4.4|^5.0",
2525
"symfony/http-foundation": "^4.3|^5.0",
2626
"symfony/http-kernel": "^4.4|^5.0",
2727
"symfony/polyfill-mbstring": "~1.0",

0 commit comments

Comments
 (0)