8000 minor #34617 [FWBundle] Remove error_renderer.serializer if the Seria… · symfony/framework-bundle@f51aabd · GitHub
[go: up one dir, main page]
Skip to content

Commit f51aabd

Browse files
nicolas-grekasnicolas-grekas
committed
minor #34617 [FWBundle] Remove error_renderer.serializer if the Serializer isn't available (dunglas)
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [FWBundle] Remove error_renderer.serializer if the Serializer isn't available | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tickets | n/a | License | MIT | Doc PR | n/a (Should help for https://github.com/hautelook/AliceBundle/pull/485). Commits ------- 0b4c21b3d2 [FWBundle] Remove error_renderer.serializer if the Serializer isn't available
2 parents a50ab5f + e443b05 commit f51aabd

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

‎Resources/config/error_renderer.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,7 @@
1414
<argument type="service" id="logger" on-invalid="null" />
1515
</service>
1616

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" />
26-
</service>
27-
2817
<service id="error_renderer.html" alias="error_handler.error_renderer.html" />
29-
<service id="error_renderer.serializer" alias="error_handler.error_renderer.serializer" />
3018
<service id="error_renderer" alias="error_renderer.html" />
3119
</services>
3220
</container>

‎Resources/config/serializer.xml

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

15-
<service id="error_renderer" alias="error_renderer.serializer" />
16-
1715
<service id="serializer" class="Symfony\Component\Serializer\Serializer" public="true">
1816
<argument type="collection" />
1917
<argument type="collection" />
@@ -152,5 +150,19 @@
152150

153151
<tag name="property_info.list_extractor" priority="-999" />
154152
</service>
153+
154+
<!-- ErrorRenderer integration -->
155+
<service id="error_renderer" alias="error_renderer.serializer" />
156+
<service id="error_renderer.serializer" alias="error_handler.error_renderer.serializer" />
157+
<service id="error_handler.error_renderer.serializer" class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer">
158+
<argument type="service" id="serializer" />
159+
<argument type="service">
160+
<service>
161+
<factory class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer" method="getPreferredFormat" />
162+
<argument type="service" id="request_stack" />
163+
</service>
164+
</argument>
165+
<argument type="service" id="error_renderer.html" />
166+
</service>
155167
</services>
156168
</container>

0 commit comments

Comments
 (0)
0