Skip to content

Commit f029827

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: [String] Update wcswidth data with Unicode 15.1 [FrameworkBundle] no serializer mapping cache in debug mode without enable_annotations [Cache] fix using multiple Redis Sentinel hosts when the first one is not resolvable
2 parents f822f54 + 96b37be commit f029827

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,6 +1867,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
18671867
$container->removeDefinition('serializer.normalizer.mime_message');
18681868
}
18691869

1870+
if ($container->getParameter('kernel.debug')) {
1871+
$container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
1872+
}
1873+
18701874
// compat with Symfony < 6.3
18711875
if (!is_subclass_of(ProblemNormalizer::class, SerializerAwareInterface::class)) {
18721876
$container->getDefinition('serializer.normalizer.problem')
@@ -1875,10 +1879,6 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
18751879

18761880
$serializerLoaders = [];
18771881
if (isset($config['enable_annotations']) && $config['enable_annotations']) {
1878-
if ($container->getParameter('kernel.debug')) {
1879-
$container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
1880-
}
1881-
18821882
$annotationLoader = new Definition(
18831883
AnnotationLoader::class,
18841884
[new Reference('annotation_reader', ContainerInterface::NULL_ON_INVALID_REFERENCE)]

Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,6 +1572,12 @@ public function testSerializerCacheActivated()
15721572
public function testSerializerCacheUsedWithoutAnnotationsAndMappingFiles()
15731573
{
15741574
$container = $this->createContainerFromFile('serializer_mapping_without_annotations', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
1575+
$this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
1576+
}
1577+
1578+
public function testSerializerCacheUsedWithoutAnnotationsAndMappingFilesNoDebug()
1579+
{
1580+
$container = $this->createContainerFromFile('serializer_mapping_without_annotations', ['kernel.debug' => false, 'kernel.container_class' => __CLASS__]);
15751581
$this->assertTrue($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
15761582
}
15771583

0 commit comments

Comments
 (0)