bug #60705 [FrameworkBundle] Fix allow loose as an email validation mode (rhel-eo)

nicolas-grekas · nicolas-grekas · commit f8cca4299ab1 · 2025-06-16T09:10:49.000+02:00
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- [FrameworkBundle] Fix allow `loose` as an email validation mode | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT After upgrading to Symfony 7.2.7 we observe this error: ``` In EnumNode.php line 82: The value "loose" is not allowed for path "framework.validation.email_valid ation_mode". Permissible values: "html5-allow-no-tld", "html5", "strict" ``` Our configuration is: ```yaml framework: ... validation: ... email_validation_mode: loose ``` From `bin/console config:dump-reference framework` we observe: ``` framework: ... validation: ... email_validation_mode: html5 # One of "html5-allow-no-tld"; "html5"; "strict" ``` After this change, the above error no longer occurs and expected allowed values are observed: ``` $ php bin/console config:dump-reference framework framework: ... validation: ... email_validation_mode: ~ # One of "html5-allow-no-tld"; "html5"; "strict"; "loose" ``` See #60373 and #60365 where the previous code was introduced. Commits ------- 23b9c4f [FrameworkBundle] Fix allow `loose` as an email validation mode
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1067,7 +1067,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
                             ->validate()->castToArray()->end()
                         ->end()
                         ->scalarNode('translation_domain')->defaultValue('validators')->end()
-                        ->enumNode('email_validation_mode')->values((class_exists(Email::class) ? Email::VALIDATION_MODES : ['html5-allow-no-tld', 'html5', 'strict']) + ['loose'])->end()
+                        ->enumNode('email_validation_mode')->values(array_merge(class_exists(Email::class) ? Email::VALIDATION_MODES : ['html5-allow-no-tld', 'html5', 'strict'], ['loose']))->end()
                         ->arrayNode('mapping')
                             ->addDefaultsIfNotSet()
                             ->fixXmlConfig('path')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -272,5 +272,6 @@ public static function emailValidationModeProvider()
         foreach (Email::VALIDATION_MODES as $mode) {
             yield [$mode];
         }
+        yield ['loose'];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -272,5 +272,6 @@ public static function emailValidationModeProvider()`
`272`	`272`	`foreach (Email::VALIDATION_MODES as $mode) {`
`273`	`273`	`yield [$mode];`
`274`	`274`	`}`
	`275`	`+ yield ['loose'];`
`275`	`276`	`}`
`276`	`277`	`}`