Skip to content

Commit 36e5177

Browse files
Merge branch '4.4' into 5.0
* 4.4: [DI] Service locators can't be decorated [HttpClient] force HTTP/1.1 when NTLM auth is used [Validation][FrameworkBundle] Allow EnableAutoMapping to work without auto-mapping namespaces [Console][SymfonyQuestionHelper] Handle multibytes question choices keys and custom prompt [DI] fix auto-binding service providers to their service subscribers [Mailer] fixed undefined index when sending mail
2 parents fa1275b + c80526b commit 36e5177

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
724724
->end()
725725
->end()
726726
->arrayNode('auto_mapping')
727-
->info('A collection of namespaces for which auto-mapping will be enabled.')
727+
->info('A collection of namespaces for which auto-mapping will be enabled by default, or null to opt-in with the EnableAutoMapping constraint.')
728728
->example([
729729
'App\\Entity\\' => [],
730730
'App\\WithSpecificLoaders\\' => ['validator.property_info_loader'],

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
11871187
}
11881188

11891189
$container->setParameter('validator.auto_mapping', $config['auto_mapping']);
1190-
if (!$propertyInfoEnabled || !$config['auto_mapping'] || !class_exists(PropertyInfoLoader::class)) {
1190+
if (!$propertyInfoEnabled || !class_exists(PropertyInfoLoader::class)) {
11911191
$container->removeDefinition('validator.property_info_loader');
11921192
}
11931193

0 commit comments

Comments
 (0)