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

minor #34617 [FWBundle] Remove error_renderer.serializer if the Serializer isn't available (dunglas)

Browse Source 
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
This commit is contained in:
Nicolas Grekas 2019-11-28 08:41:19 +01:00
commit ac20382f41
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml
View File

@ -14,19 +14,7 @@
<argument type="service" id="logger" on-invalid="null" />
</service>
<service id="error_handler.error_renderer.serializer" class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer">
<argument type="service" id="serializer" />
<argument type="service">
<service>
<factory class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer" method="getPreferredFormat" />
<argument type="service" id="request_stack" />
</service>
</argument>
<argument type="service" id="error_renderer.html" />
</service>
<service id="error_renderer.html" alias="error_handler.error_renderer.html" />
<service id="error_renderer.serializer" alias="error_handler.error_renderer.serializer" />
<service id="error_renderer" alias="error_renderer.html" />
</services>
</container>

16
src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
View File

@ -12,8 +12,6 @@
<services>
<defaults public="false" />
<service id="error_renderer" alias="error_renderer.serializer" />
<service id="serializer" class="Symfony\Component\Serializer\Serializer" public="true">
<argument type="collection" />
<argument type="collection" />
@ -152,5 +150,19 @@
<tag name="property_info.list_extractor" priority="-999" />
</service>
<!-- ErrorRenderer integration -->
<service id="error_renderer" alias="error_renderer.serializer" />
<service id="error_renderer.serializer" alias="error_handler.error_renderer.serializer" />
<service id="error_handler.error_renderer.serializer" class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer">
<argument type="service" id="serializer" />
<argument type="service">
<service>
<factory class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer" method="getPreferredFormat" />
<argument type="service" id="request_stack" />
</service>
</argument>
<argument type="service" id="error_renderer.html" />
</service>
</services>
</container>