Skip to content

Commit b8415ba

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: [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 abe57a7 + f029827 commit b8415ba

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
@@ -1891,16 +1891,16 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
18911891
$container->removeDefinition('serializer.normalizer.mime_message');
18921892
}
18931893

1894+
if ($container->getParameter('kernel.debug')) {
1895+
$container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
1896+
}
1897+
18941898
if (!class_exists(Translator::class)) {
18951899
$container->removeDefinition('serializer.normalizer.translatable');
18961900
}
18971901

18981902
$serializerLoaders = [];
18991903
if (isset($config['enable_attributes']) && $config['enable_attributes']) {
1900-
if ($container->getParameter('kernel.debug')) {
1901-
$container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
1902-
}
1903-
19041904
$annotationLoader = new Definition(
19051905
AnnotationLoader::class,
19061906
[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
@@ -1612,6 +1612,12 @@ public function testSerializerCacheActivated()
16121612
public function testSerializerCacheUsedWithoutAnnotationsAndMappingFiles()
16131613
{
16141614
$container = $this->createContainerFromFile('serializer_mapping_without_annotations', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
1615+
$this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
1616+
}
1617+
1618+
public function testSerializerCacheUsedWithoutAnnotationsAndMappingFilesNoDebug()
1619+
{
1620+
$container = $this->createContainerFromFile('serializer_mapping_without_annotations', ['kernel.debug' => false, 'kernel.container_class' => __CLASS__]);
16151621
$this->assertTrue($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
16161622
}
16171623

0 commit comments

Comments
 (0)