Skip to content

Commit 34216bd

Browse files
Merge branch '5.1'
* 5.1: (36 commits) Fixed left-over debug statement set column length for mysql 5.6 compatibility [Mime] Remove unused var [HttpClient] fix monitoring timeouts when other streams are active [PhpUnitBridge] fix syntax on PHP 5.3 [PhpUnitBridge] Fix undefined index when output of "composer show" cannot be parsed properly cascade validation to child forms [PropertyAccess] Fix getter call order BC [PhpUnitBridge] fix undefined var on version 3.4 Fix invalid char in SQS Headers Move ajax clear event listener initialization on loadToolbar [HttpClient] Throw JsonException instead of TransportException on empty response in Response::toArray() Fix CS FrameworkBundle Serializer issue register event listeners depending on the installed packages take into account the context when preserving empty array objects Only register CSRF protection listener if CSRF is available [VarExporter] tfix: s/markAsSkipped/markTestSkipped/ Also check PUBLIC_ACCESS for authenticated tokens Fix enabled_locales behavior ...
2 parents 9f45d71 + bcc8c1e commit 34216bd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
10941094
$defaultOptions['cache_dir'] = $config['cache_dir'];
10951095
$translator->setArgument(4, $defaultOptions);
10961096

1097-
$translator->setArgument(6, $config['enabled_locales']);
1097+
$translator->setArgument(5, $config['enabled_locales']);
10981098

10991099
$container->setParameter('translator.logging', $config['logging']);
11001100
$container->setParameter('translator.default_path', $config['default_path']);
@@ -1379,7 +1379,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
13791379

13801380
private function registerPropertyAccessConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
13811381
{
1382-
if (!class_exists('Symfony\Component\PropertyAccess\PropertyAccessor')) {
1382+
if (!class_exists(PropertyAccessor::class)) {
13831383
return;
13841384
}
13851385

@@ -1463,7 +1463,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
14631463

14641464
$chainLoader = $container->getDefinition('serializer.mapping.chain_loader');
14651465

1466-
if (!class_exists('Symfony\Component\PropertyAccess\PropertyAccessor')) {
1466+
if (!class_exists(PropertyAccessor::class)) {
14671467
$container->removeAlias('serializer.property_accessor');
14681468
$container->removeDefinition('serializer.normalizer.object');
14691469
}
@@ -1472,7 +1472,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
14721472
$container->removeDefinition('serializer.encoder.yaml');
14731473
}
14741474

1475-
if (!class_exists(UnwrappingDenormalizer::class)) {
1475+
if (!class_exists(UnwrappingDenormalizer::class) || !class_exists(PropertyAccessor::class)) {
14761476
$container->removeDefinition('serializer.denormalizer.unwrapping');
14771477
}
14781478

0 commit comments

Comments
 (0)