Merge branch '6.4' into 7.2

xabbuh · xabbuh · commit dd92e42ac643 · 2025-05-07T09:45:33.000+02:00
* 6.4:
  properly skip signal test if the pcntl extension is not installed
  ensure that all supported e-mail validation modes can be configured
  [Security][LoginLink] Throw InvalidLoginLinkException on invalid parameters
  don't hardcode OS-depending constant values
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -46,6 +46,7 @@
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\Uid\Factory\UuidFactory;
+use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Validation;
 use Symfony\Component\Webhook\Controller\WebhookController;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
@@ -1018,7 +1019,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
                             ->validate()->castToArray()->end()
                         ->end()
                         ->scalarNode('translation_domain')->defaultValue('validators')->end()
-                        ->enumNode('email_validation_mode')->values(['html5', 'loose', 'strict'])->defaultValue('html5')->end()
+                        ->enumNode('email_validation_mode')->values(Email::VALIDATION_MODES + ['loose'])->defaultValue('html5')->end()
                         ->arrayNode('mapping')
                             ->addDefaultsIfNotSet()
                             ->fixXmlConfig('path')
diff --git a/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -17,6 +17,7 @@
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Exception\OutOfBoundsException;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Workflow\Exception\InvalidDefinitionException;
 
 class PhpFrameworkExtensionTest extends FrameworkExtensionTestCase
@@ -265,4 +266,31 @@ public function testRateLimiterIsTagged()
         $this->assertSame('first', $container->getDefinition('limiter.first')->getTag('rate_limiter')[0]['name']);
         $this->assertSame('second', $container->getDefinition('limiter.second')->getTag('rate_limiter')[0]['name']);
     }
+
+    /**
+     * @dataProvider emailValidationModeProvider
+     */
+    public function testValidatorEmailValidationMode(string $mode)
+    {
+        $this->expectNotToPerformAssertions();
+
+        $this->createContainerFromClosure(function (ContainerBuilder $container) use ($mode) {
+            $container->loadFromExtension('framework', [
+                    'annotations' => false,
+                    'http_method_override' => false,
+                    'handle_all_throwables' => true,
+                    'php_errors' => ['log' => true],
+                'validation' => [
+                    'email_validation_mode' => $mode,
+                ],
+            ]);
+        });
+    }
+
+    public function emailValidationModeProvider()
+    {
+        foreach (Email::VALIDATION_MODES as $mode) {
+            yield [$mode];
+        }
+    }
 }
