Skip to content

Commit e909ede

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: (39 commits) fix merge add missing return type-hints fix merge explicitly mark nullable parameters as nullable fix low deps tests [HttpKernel] Fix datacollector caster for reference object property [Serializer] Fixing PHP warning in the ObjectNormalizer with MaxDepth enabled bug #51578 [Cache] always select database for persistent redis connections [Security] Validate that CSRF token in form login is string similar to username/password [Serializer] Use explicit nullable type [validator] validated Dutch translation Improve dutch translations initialize the current time with midnight before modifying the date [Translation] Skip state=needs-translation entries only when source == target [HttpKernel] Ensure controllers are not lazy [Validator] Fill in trans-unit id 113: This URL does not contain a TLD. [Validator] added missing Polish translation for unit 113 [Validator] add missing lv translation fix tests [HttpClient] Let curl handle transfer encoding ...
2 parents bc336a1 + 86e918d commit e909ede

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
14681468
$defaultDir = $container->getParameterBag()->resolveValue($config['default_path']);
14691469
foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
14701470
if ($container->fileExists($dir = $bundle['path'].'/Resources/translations') || $container->fileExists($dir = $bundle['path'].'/translations')) {
1471-
$dirs[] = $dir;
1471+
$dirs[] = $transPaths[] = $dir;
14721472
} else {
14731473
$nonExistingDirs[] = $dir;
14741474
}

Resources/config/serializer.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115

116116
->set('serializer.normalizer.translatable', TranslatableNormalizer::class)
117117
->args(['$translator' => service('translator')])
118-
->tag('serializer.normalizer', ['priority' => -890])
118+
->tag('serializer.normalizer', ['priority' => -920])
119119

120120
->set('serializer.normalizer.form_error', FormErrorNormalizer::class)
121121
->tag('serializer.normalizer', ['priority' => -915])
@@ -138,6 +138,8 @@
138138
service('property_info')->ignoreOnInvalid(),
139139
service('serializer.mapping.class_discriminator_resolver')->ignoreOnInvalid(),
140140
null,
141+
[],
142+
service('property_info')->ignoreOnInvalid(),
141143
])
142144

143145
->set('serializer.denormalizer.array', ArrayDenormalizer::class)
@@ -212,6 +214,6 @@
212214
])
213215

214216
->set('serializer.normalizer.backed_enum', BackedEnumNormalizer::class)
215-
->tag('serializer.normalizer', ['priority' => -880])
217+
->tag('serializer.normalizer', ['priority' => -915])
216218
;
217219
};

Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
6969
use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
7070
use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
71+
use Symfony\Component\Serializer\Normalizer\BackedEnumNormalizer;
7172
use Symfony\Component\Serializer\Normalizer\ConstraintViolationListNormalizer;
7273
use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
7374
use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer;
@@ -1555,10 +1556,24 @@ public function testTranslatableNormalizerRegistered()
15551556
$tag = $definition->getTag('serializer.normalizer');
15561557

15571558
$this->assertSame(TranslatableNormalizer::class, $definition->getClass());
1558-
$this->assertSame(-890, $tag[0]['priority']);
1559+
$this->assertSame(-920, $tag[0]['priority']);
15591560
$this->assertEquals(new Reference('translator'), $definition->getArgument('$translator'));
15601561
}
15611562

1563+
/**
1564+
* @see https://github.com/symfony/symfony/issues/54478
1565+
*/
1566+
public function testBackedEnumNormalizerRegistered()
1567+
{
1568+
$container = $this->createContainerFromFile('full');
1569+
1570+
$definition = $container->getDefinition('serializer.normalizer.backed_enum');
1571+
$tag = $definition->getTag('serializer.normalizer');
1572+
1573+
$this->assertSame(BackedEnumNormalizer::class, $definition->getClass());
1574+
$this->assertSame(-915, $tag[0]['priority']);
1575+
}
1576+
15621577
public function testSerializerCacheActivated()
15631578
{
15641579
$container = $this->createContainerFromFile('serializer_enabled');

0 commit comments

Comments
 (0)