minor #32046 [FrameworkBundle] Unconditionally register the DateIntervalNormalizer (ogizanagi)

ogizanagi · ogizanagi · commit 26048bc49882 · 2019-07-01T17:04:24.000+02:00
This PR was merged into the 4.2 branch. Discussion ---------- [FrameworkBundle] Unconditionally register the DateIntervalNormalizer | Q | A | ------------- | --- | Branch? | 4.2  | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | N/A  | License | MIT | Doc PR | N/A Fwb conflicts with serializer <4.2 https://github.com/symfony/symfony/blob/37fa45bbd1553ee5ce6efdb79bd003b7327f7376/src/Symfony/Bundle/FrameworkBundle/composer.json#L74 so we can remove this obsolete condition from the extension (DateIntervalNormalizer exists since 3.4). Commits ------- c7cc780 [FrameworkBundle] Unconditionally register the DateIntervalNormalizer
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -89,7 +89,6 @@
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
 use Symfony\Component\Serializer\Normalizer\ConstraintViolationListNormalizer;
-use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
@@ -1316,10 +1315,6 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
     {
         $loader->load('serializer.xml');
 
-        if (!class_exists(DateIntervalNormalizer::class)) {
-            $container->removeDefinition('serializer.normalizer.dateinterval');
-        }
-
         if (!class_exists(ConstraintViolationListNormalizer::class)) {
             $container->removeDefinition('serializer.normalizer.constraint_violation_list');
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1102,10 +1102,6 @@ public function testDataUriNormalizerRegistered()
 
     public function testDateIntervalNormalizerRegistered()
     {
-        if (!class_exists(DateIntervalNormalizer::class)) {
-            $this->markTestSkipped('The DateIntervalNormalizer has been introduced in the Serializer Component version 3.4.');
-        }
-
         $container = $this->createContainerFromFile('full');
 
         $definition = $container->getDefinition('serializer.normalizer.dateinterval');

Original file line number	Diff line number	Diff line change
`@@ -1102,10 +1102,6 @@ public function testDataUriNormalizerRegistered()`
`1102`	`1102`
`1103`	`1103`	`public function testDateIntervalNormalizerRegistered()`
`1104`	`1104`	`{`
`1105`		`- if (!class_exists(DateIntervalNormalizer::class)) {`
`1106`		`- $this->markTestSkipped('The DateIntervalNormalizer has been introduced in the Serializer Component version 3.4.');`
`1107`		`- }`
`1108`		`-`
`1109`	`1105`	`$container = $this->createContainerFromFile('full');`
`1110`	`1106`
`1111`	`1107`	`$definition = $container->getDefinition('serializer.normalizer.dateinterval');`