8000 Merge branch '7.2' into 7.3 · symfony/symfony@d044b21 · GitHub
[go: up one dir, main page]
Skip to content

Commit d044b21

Browse files
xabbuhxabbuh
committed
Merge branch '7.2' into 7.3
* 7.2: fix tests [FrameworkBundle] Ensure `Email` class exists before using it
2 parents 0040477 + 0c0b839 commit d044b21

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
10761076
->validate()->castToArray()->end()
10771077
->end()
10781078
->scalarNode('translation_domain')->defaultValue('validators')->end()
1079-
->enumNode('email_validation_mode')->values(Email::VALIDATION_MODES + ['loose'])->defaultValue('html5')->end()
1079+
->enumNode('email_validation_mode')->values((class_exists(Email::class) ? Email::VALIDATION_MODES : ['html5-allow-no-tld', 'html5', 'strict']) + ['loose'])->defaultValue('html5')->end()
10801080
->arrayNode('mapping')
10811081
->addDefaultsIfNotSet()
10821082
->fixXmlConfig('path')

0 commit comments

Comments
 (0)
0