8000 minor #24641 [FrameworkBundle][Serializer] Move DateIntervalNormalize… · symfony/symfony@d5315f1 · GitHub
[go: up one dir, main page]
Skip to content

Commit d5315f1

Browse files
fabpotfabpot
committed
minor #24641 [FrameworkBundle][Serializer] Move DateIntervalNormalizer definition to xml (ogizanagi)
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle][Serializer] Move DateIntervalNormalizer definition to xml | Q | A | ------------- | --- | Branch? | 3.4 <!-- see comment below --> | Bug fix? | no | New feature? | no <!-- don't forget to update src/**/CHANGELOG.md files --> | BC breaks? | no | Deprecations? | no <!-- don't forget to update UPGRADE-*.md files --> | Tests pass? | yes | Fixed tickets | #24634 (comment) <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | N/A Same as #24634 for the remaining normalizer introduced in 3.4. Commits ------- 11244d5 [FrameworkBundle][Serializer] Move DateIntervalNormalizer definition to xml
2 parents c3617bd + 11244d5 commit d5315f1

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,13 +1540,6 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
15401540
$definition->addTag('serializer.normalizer', array('priority' => -920));
15411541
}
15421542

1543-
if (class_exists(DateIntervalNormalizer::class)) {
1544-
// Run before serializer.normalizer.object
1545-
$definition = $container->register('serializer.normalizer.dateinterval', DateIntervalNormalizer::class);
1546-
$definition->setPublic(false);
1547-
$definition->addTag('serializer.normalizer', array('priority' => -915));
1548-
}
1549-
15501543
if (class_exists('Symfony\Component\Serializer\Normalizer\DateTimeNormalizer')) {
15511544
// Run before serializer.normalizer.object
15521545
$definition = $container->register('serializer.normalizer.datetime', DateTimeNormalizer::class);
@@ -1575,6 +1568,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
15751568

15761569
$loader->load('serializer.xml');
15771570

1571+
if (!class_exists(DateIntervalNormalizer::class)) {
1572+
$container->removeDefinition('serializer.normalizer.dateinterval');
1573+
}
1574+
15781575
$container->getDefinition('serializer.mapping.cache.symfony')->setPrivate(true);
15791576

15801577
$chainLoader = $container->getDefinition('serializer.mapping.chain_loader');

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
<service id="serializer.property_accessor" alias="property_accessor" />
2626

2727
<!-- Normalizer -->
28+
<service id="serializer.normalizer.dateinterval" class="Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer">
29+
<!-- Run before serializer.normalizer.object -->
30+
<tag name="serializer.normalizer" priority="-915" />
31+
</service>
32+
2833
<service id="serializer.normalizer.object" class="Symfony\Component\Serializer\Normalizer\ObjectNormalizer">
2934
<argument type="service" id="serializer.mapping.class_metadata_factory" />
3035
<argument>null</argument> <!-- name converter -->

0 commit comments

Comments
 (0)
0