Skip to content

Commit 86e918d

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: (23 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 [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 ...
2 parents cb97c0e + e1aaae1 commit 86e918d

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
@@ -1481,7 +1481,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
14811481
$defaultDir = $container->getParameterBag()->resolveValue($config['default_path']);
14821482
foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
14831483
if ($container->fileExists($dir = $bundle['path'].'/Resources/translations') || $container->fileExists($dir = $bundle['path'].'/translations')) {
1484-
$dirs[] = $dir;
1484+
$dirs[] = $transPaths[] = $dir;
14851485
} else {
14861486
$nonExistingDirs[] = $dir;
14871487
}

Resources/config/serializer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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)

0 commit comments

Comments
 (0)