From 11244d51ee45df06d688d7048c12e6cce1dce827 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <maxime.steinhausser@elao.com>
Date: Fri, 20 Oct 2017 09:39:07 +0200
Subject: [PATCH] [FrameworkBundle][Serializer] Move DateIntervalNormalizer
 definition to xml

---
 .../DependencyInjection/FrameworkExtension.php        | 11 ++++-------
 .../FrameworkBundle/Resources/config/serializer.xml   |  5 +++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 5eb3c24dff08f..07df3ff889819 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1540,13 +1540,6 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $definition->addTag('serializer.normalizer', array('priority' => -920));
         }
 
-        if (class_exists(DateIntervalNormalizer::class)) {
-            // Run before serializer.normalizer.object
-            $definition = $container->register('serializer.normalizer.dateinterval', DateIntervalNormalizer::class);
-            $definition->setPublic(false);
-            $definition->addTag('serializer.normalizer', array('priority' => -915));
-        }
-
         if (class_exists('Symfony\Component\Serializer\Normalizer\DateTimeNormalizer')) {
             // Run before serializer.normalizer.object
             $definition = $container->register('serializer.normalizer.datetime', DateTimeNormalizer::class);
@@ -1575,6 +1568,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
 
         $loader->load('serializer.xml');
 
+        if (!class_exists(DateIntervalNormalizer::class)) {
+            $container->removeDefinition('serializer.normalizer.dateinterval');
+        }
+
         $container->getDefinition('serializer.mapping.cache.symfony')->setPrivate(true);
 
         $chainLoader = $container->getDefinition('serializer.mapping.chain_loader');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
index 5fed443127d5a..16edff5446e35 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -25,6 +25,11 @@
         <service id="serializer.property_accessor" alias="property_accessor" />
 
         <!-- Normalizer -->
+        <service id="serializer.normalizer.dateinterval" class="Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer">
+            <!-- Run before serializer.normalizer.object -->
+            <tag name="serializer.normalizer" priority="-915" />
+        </service>
+
         <service id="serializer.normalizer.object" class="Symfony\Component\Serializer\Normalizer\ObjectNormalizer">
             <argument type="service" id="serializer.mapping.class_metadata_factory" />
             <argument>null</argument> <!-- name converter -->