Skip to content

Commit d5f2239

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4'
* 4.4: [ErrorHandler] help finish the PR [ErrorHandler] merge and remove the ErrorRenderer component
2 parents af956e3 + f60c3e9 commit d5f2239

File tree

6 files changed

+21
-32
lines changed

6 files changed

+21
-32
lines changed

‎DependencyInjection/Compiler/UnusedTagsPass.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class UnusedTagsPass implements CompilerPassInterface
3232
'controller.service_arguments',
3333
'config_cache.resource_checker',
3434
'data_collector',
35-
'error_renderer.renderer',
3635
'form.type',
3736
'form.type_extension',
3837
'form.type_guesser',

‎FrameworkBundle.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
use Symfony\Component\DependencyInjection\Compiler\RegisterReverseContainerPass;
3333
use Symfony\Component\DependencyInjection\ContainerBuilder;
3434
use Symfony\Component\ErrorHandler\ErrorHandler;
35-
use Symfony\Component\ErrorRenderer\DependencyInjection\ErrorRendererPass;
3635
use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
3736
use Symfony\Component\Form\DependencyInjection\FormPass;
3837
use Symfony\Component\HttpClient\DependencyInjection\HttpClientPass;
@@ -91,7 +90,6 @@ public function build(ContainerBuilder $container)
9190
KernelEvents::FINISH_REQUEST,
9291
];
9392

94-
$container->addCompilerPass(new ErrorRendererPass());
9593
$container->addCompilerPass(new LoggerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
9694
$container->addCompilerPass(new RegisterControllerArgumentLocatorsPass());
9795
$container->addCompilerPass(new RemoveEmptyControllerArgumentLocatorsPass(), PassConfig::TYPE_BEFORE_REMOVING);

‎Resources/config/console.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,6 @@
193193
<tag name="console.command" command="debug:form" />
194194
</service>
195195

196-
<service id="console.command.error_renderer_debug" class="Symfony\Component\ErrorRenderer\Command\DebugCommand">
197-
<argument type="collection" /> <!-- All error renderers are injected here by ErrorRendererPass -->
198-
<argument type="service" id="debug.file_link_formatter" on-invalid="null" />
199-
<tag name="console.command" command="debug:error-renderer" />
200-
</service>
201-
202196
<service id="console.command.secrets_set" class="Symfony\Bundle\FrameworkBundle\Command\SecretsSetCommand">
203197
<argument type="service" id="secrets.vault" />
204198
<argument type="service" id="secrets.local_vault" on-invalid="ignore" />

‎Resources/config/error_renderer.xml‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<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" />
8+
<service id="error_handler.error_renderer.html" class="Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer">
149
<argument>%kernel.debug%</argument>
1510
<argument>%kernel.charset%</argument>
1611
<argument type="service" id="debug.file_link_formatter" on-invalid="null" />
@@ -19,21 +14,19 @@
1914
<argument type="service" id="logger" on-invalid="null" />
2015
</service>
2116

22-
<service id="error_renderer.renderer.json" class="Symfony\Component\ErrorRenderer\ErrorRenderer\JsonErrorRenderer">
23-
<tag name="error_renderer.renderer" />
24-
<argument>%kernel.debug%</argument>
17+
<service id="error_handler.error_renderer.serializer" class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer">
18+
<argument type="service" id="serializer" />
19+
<argument type="service">
20+
<service>
21+
<factory class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer" method="getPreferredFormat" />
22+
<argument type="service" id="request_stack" />
23+
</service>
24+
</argument>
25+
<argument type="service" id="error_renderer.html" />
2526
</service>
2627

27-
<service id="error_renderer.renderer.xml" class="Symfony\Component\ErrorRenderer\ErrorRenderer\XmlErrorRenderer">
28-
<tag name="error_renderer.renderer" format="atom" />
29-
<tag name="error_renderer.renderer" />
30-
<argument>%kernel.debug%</argument>
31-
<argument>%kernel.charset%</argument>
32-
</service>
33-
34-
<service id="error_renderer.renderer.txt" class="Symfony\Component\ErrorRenderer\ErrorRenderer\TxtErrorRenderer">
35-
<tag name="error_renderer.renderer" />
36-
<argument>%kernel.debug%</argument>
37-
</service>
28+
<service id="error_renderer.html" alias="error_handler.error_renderer.html" />
29+
<service id="error_renderer.serializer" alias="error_handler.error_renderer.serializer" />
30+
<service id="error_renderer" alias="error_renderer.html" />
3831
</services>
3932
</container>

‎Resources/config/serializer.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<services>
1313
<defaults public="false" />
1414

15+
<service id="error_renderer" alias="error_renderer.serializer" />
16+
1517
<service id="serializer" class="Symfony\Component\Serializer\Serializer" public="true">
1618
<argument type="collection" />
1719
<argument type="collection" />
@@ -59,6 +61,12 @@
5961
<tag name="serializer.normalizer" priority="-900" />
6062
</service>
6163

64+
<service id="serializer.normalizer.problem" class="Symfony\Component\Serializer\Normalizer\ProblemNormalizer">
65+
<argument>%kernel.debug%</argument>
66+
<!-- Run before serializer.normalizer.object -->
67+
<tag name="serializer.normalizer" priority="-890" />
68+
</service>
69+
6270
<service id="serializer.normalizer.object" class="Symfony\Component\Serializer\Normalizer\ObjectNormalizer">
6371
<argument type="service" id="serializer.mapping.class_metadata_factory" />
6472
<argument type="service" id="serializer.name_converter.metadata_aware" />

‎composer.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"symfony/cache": "^4.4|^5.0",
2222
"symfony/config": "^5.0",
2323
"symfony/dependency-injection": "^5.0",
24-
"symfony/error-renderer": "^4.4|^5.0",
2524
"symfony/http-foundation": "^4.4|^5.0",
2625
"symfony/http-kernel": "^5.0",
2726
"symfony/polyfill-mbstring": "~1.0",
@@ -55,7 +54,6 @@
5554
"symfony/translation": "^5.0",
5655
"symfony/twig-bundle": "^4.4|^5.0",
5756
"symfony/validator": "^4.4|^5.0",
58-
"symfony/var-dumper": "^4.4|^5.0",
5957
"symfony/workflow": "^4.4|^5.0",
6058
"symfony/yaml": "^4.4|^5.0",
6159
"symfony/property-info": "^4.4|^5.0",
@@ -86,7 +84,6 @@
8684
"symfony/twig-bridge": "<4.4",
8785
"symfony/twig-bundle": "<4.4",
8886
"symfony/validator": "<4.4",
89-
"symfony/var-dumper": "<4.4",
9087
"symfony/workflow": "<4.4"
9188
},
9289
"suggest": {

0 commit comments

Comments
 (0)