Skip to content

Commit e1aaae1

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: explicitly mark nullable parameters as nullable fix low deps tests [HttpKernel] Fix datacollector caster for reference object property bug #51578 [Cache] always select database for persistent redis connections [Security] Validate that CSRF token in form login is string similar to username/password [validator] validated Dutch translation Improve dutch translations [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 [HttpClient] Let curl handle transfer encoding [Messenger] Make Doctrine connection ignore unrelated tables on setup [HttpFoundation] Set content-type header in RedirectResponse add translations for the requireTld constraint option message [Serializer] Fix unexpected allowed attributes [FrameworkBundle] Fix registration of the bundle path to translation
2 parents d17b520 + fa8b095 commit e1aaae1

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
15071507
$defaultDir = $container->getParameterBag()->resolveValue($config['default_path']);
15081508
foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
15091509
if ($container->fileExists($dir = $bundle['path'].'/Resources/translations') || $container->fileExists($dir = $bundle['path'].'/translations')) {
1510-
$dirs[] = $dir;
1510+
$dirs[] = $transPaths[] = $dir;
15111511
} else {
15121512
$nonExistingDirs[] = $dir;
15131513
}

Resources/config/serializer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@
142142
service('property_info')->ignoreOnInvalid(),
143143
service('serializer.mapping.class_discriminator_resolver')->ignoreOnInvalid(),
144144
null,
145+
[],
146+
service('property_info')->ignoreOnInvalid(),
145147
])
146148

147149
->alias(PropertyNormalizer::class, 'serializer.normalizer.property')

0 commit comments

Comments
 (0)