Skip to content

Commit 07eaa09

Browse files
Merge branch '5.3' into 5.4
* 5.3: CS fix Missing translations from traits Fix SkippedTestSuite [Console] Fix type annotation on InputInterface::hasArgument() Revert "minor #41949 [Console] fix type annotations on InputInterface (nicolas-grekas)" [EventDispatcher] Correct the called event listener method case [Serializer] Need to clear cache when updating Annotation Groups on Entities Add missing translations for Japanese. Revert "bug #41952 [Console] fix handling positional arguments (nicolas-grekas)" Fix test [Security] Don't skip UserPasswordValidatorTest [DI] CS fix [Console] fix handling positional arguments [Validator] add translation for Vietnamese Add Bulgarian translation for the validator fix backport [Console] fix type annotations on InputInterface
2 parents f2a2114 + 12da615 commit 07eaa09

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1708,6 +1708,9 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild
17081708
private function registerSerializerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
17091709
{
17101710
$loader->load('serializer.php');
1711+
if ($container->getParameter('kernel.debug')) {
1712+
$container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
1713+
}
17111714

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

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,10 +1400,10 @@ public function testSerializerCacheActivated()
14001400
$this->assertEquals(new Reference('serializer.mapping.cache.symfony'), $cache);
14011401
}
14021402

1403-
public function testSerializerCacheActivatedDebug()
1403+
public function testSerializerCacheNotActivatedDebug()
14041404
{
14051405
$container = $this->createContainerFromFile('serializer_enabled', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
1406-
$this->assertTrue($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
1406+
$this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
14071407
}
14081408

14091409
public function testSerializerMapping()

0 commit comments

Comments
 (0)