Skip to content

Commit 3874a6d

Browse files
Merge branch '7.2' into 7.3
* 7.2: [FrameworkBundle] Fix allow `loose` as an email validation mode [Messenger] Fix float value for worker memory limit
2 parents 6cd8ad5 + 9218dcd commit 3874a6d

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
@@ -1096,7 +1096,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
10961096
->validate()->castToArray()->end()
10971097
->end()
10981098
->scalarNode('translation_domain')->defaultValue('validators')->end()
1099-
->enumNode('email_validation_mode')->values((class_exists(Email::class) ? Email::VALIDATION_MODES : ['html5-allow-no-tld', 'html5', 'strict']) + ['loose'])->defaultValue('html5')->end()
1099+
->enumNode('email_validation_mode')->values(array_merge(class_exists(Email::class) ? Email::VALIDATION_MODES : ['html5-allow-no-tld', 'html5', 'strict'], ['loose']))->defaultValue('html5')->end()
11001100
->arrayNode('mapping')
11011101
->addDefaultsIfNotSet()
11021102
->fixXmlConfig('path')

DependencyInjection/FrameworkExtension.php

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

1776-
if (!isset($config['email_validation_mode'])) {
1777-
$config['email_validation_mode'] = 'loose';
1778-
}
1779-
17801776
$loader->load('validator.php');
17811777

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

Tests/DependencyInjection/PhpFrameworkExtensionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ public static function emailValidationModeProvider()
456456
foreach (Email::VALIDATION_MODES as $mode) {
457457
yield [$mode];
458458
}
459+
yield ['loose'];
459460
}
460461
}
461462

0 commit comments

Comments
 (0)