From 0b4c21b3d2ddd6ac0496608eeca38f944fe42f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Mon, 25 Nov 2019 23:23:00 +0100
Subject: [PATCH] [FWBundle] Remove error_renderer.serializer if the Serializer
 isn't available

---
 .../Resources/config/error_renderer.xml          | 12 ------------
 .../Resources/config/serializer.xml              | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml
index af80a51d3f67..84330e6b6bbd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/error_renderer.xml
@@ -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>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
index 4698c505930a..3f76480e7d30 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -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" />
@@ -147,5 +145,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>