Skip to content

Commit ad750cf

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: fix tests [FrameworkBundle] Ensure `Email` class exists before using it
2 parents dd92e42 + b238ab0 commit ad750cf

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

DependencyInjection/Configuration.php

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

0 commit comments

Comments
 (0)