Skip to content

Commit 9218dcd

Browse files
Merge branch '6.4' into 7.2
* 6.4: [FrameworkBundle] Fix allow `loose` as an email validation mode [Messenger] Fix float value for worker memory limit
2 parents 4e7ea17 + e06d879 commit 9218dcd

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
10201020
->validate()->castToArray()->end()
10211021
->end()
10221022
->scalarNode('translation_domain')->defaultValue('validators')->end()
1023-
->enumNode('email_validation_mode')->values((class_exists(Email::class) ? Email::VALIDATION_MODES : ['html5-allow-no-tld', 'html5', 'strict']) + ['loose'])->defaultValue('html5')->end()
1023+
->enumNode('email_validation_mode')->values(array_merge(class_exists(Email::class) ? Email::VALIDATION_MODES : ['html5-allow-no-tld', 'html5', 'strict'], ['loose']))->defaultValue('html5')->end()
10241024
->arrayNode('mapping')
10251025
->addDefaultsIfNotSet()
10261026
->fixXmlConfig('path')

DependencyInjection/FrameworkExtension.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,10 +1630,6 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
16301630
throw new LogicException('Validation support cannot be enabled as the Validator component is not installed. Try running "composer require symfony/validator".');
16311631
}
16321632

1633-
if (!isset($config['email_validation_mode'])) {
1634-
$config['email_validation_mode'] = 'loose';
1635-
}
1636-
16371633
$loader->load('validator.php');
16381634

16391635
$validatorBuilder = $container->getDefinition('validator.builder');

Tests/DependencyInjection/PhpFrameworkExtensionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,5 +292,6 @@ public static function emailValidationModeProvider()
292292
foreach (Email::VALIDATION_MODES as $mode) {
293293
yield [$mode];
294294
}
295+
yield ['loose'];
295296
}
296297
}

0 commit comments

Comments
 (0)