symfony · fabpot · Dec 14, 2017 · Dec 12, 2017 · xabbuh · Dec 13, 2017
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -645,6 +645,27 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
                 ->arrayNode('validation')
                     ->info('validation configuration')
                     ->{!class_exists(FullStack::class) && class_exists(Validation::class) ? 'canBeDisabled' : 'canBeEnabled'}()
+                    ->validate()
+                        ->ifTrue(function ($v) { return isset($v['strict_email']) && isset($v['email_validation_mode']); })
+                        ->thenInvalid('"strict_email" and "email_validation_mode" cannot be used together.')
+                    ->end()
+                    ->beforeNormalization()
+                        ->ifTrue(function ($v) { return isset($v['strict_email']); })
+                        ->then(function ($v) {
+                            @trigger_error('The "framework.validation.strict_email" configuration key has been deprecated in Symfony 4.1. Use the "framework.validation.email_validation_mode" configuration key instead.', E_USER_DEPRECATED);
+
+                            return $v;
+                        })
+                    ->end()
+                    ->beforeNormalization()
+                        ->ifTrue(function ($v) { return isset($v['strict_email']) && !isset($v['email_validation_mode']); })
+                        ->then(function ($v) {
+                            $v['email_validation_mode'] = $v['strict_email'] ? 'strict' : 'loose';
+                            unset($v['strict_email']);
+
+                            return $v;
+                        })
+                    ->end()
                     ->children()
                         ->scalarNode('cache')->end()
                         ->booleanNode('enable_annotations')->{!class_exists(FullStack::class) && class_exists(Annotation::class) ? 'defaultTrue' : 'defaultFalse'}()->end()
@@ -658,7 +679,8 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
                             ->end()
                         ->end()
                         ->scalarNode('translation_domain')->defaultValue('validators')->end()
-                        ->booleanNode('strict_email')->defaultFalse()->end()
+                        ->booleanNode('strict_email')->end()
+                        ->enumNode('email_validation_mode')->values(array('html5', 'loose', 'strict'))->end()
                         ->arrayNode('mapping')
                             ->addDefaultsIfNotSet()
                             ->fixXmlConfig('path')

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -976,6 +976,10 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
             throw new LogicException('Validation support cannot be enabled as the Validator component is not installed.');
         }
 
+        if (!isset($config['email_validation_mode'])) {
+            $config['email_validation_mode'] = 'loose';
+        }
+
         $loader->load('validator.xml');
 
         $validatorBuilder = $container->getDefinition('validator.builder');
@@ -994,7 +998,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
         }
 
         $definition = $container->findDefinition('validator.email');
-        $definition->replaceArgument(0, $config['strict_email']);
+        $definition->replaceArgument(0, $config['email_validation_mode']);
 
         if (array_key_exists('enable_annotations', $config) && $config['enable_annotations']) {
             if (!$this->annotationsConfigEnabled) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -199,6 +199,8 @@
         <xsd:attribute name="cache" type="xsd:string" />
         <xsd:attribute name="enable-annotations" type="xsd:boolean" />
         <xsd:attribute name="static-method" type="xsd:boolean" />
+        <xsd:attribute name="strict-email" type="xsd:boolean" />
+        <xsd:attribute name="email-validation-mode" type="email-validation-mode" />
     </xsd:complexType>
 
     <xsd:complexType name="file_mapping">
@@ -207,6 +209,14 @@
         </xsd:sequence>
     </xsd:complexType>
 
+    <xsd:simpleType name="email-validation-mode">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="html5" />
+            <xsd:enumeration value="loose" />
+            <xsd:enumeration value="strict" />
+        </xsd:restriction>
+    </xsd:simpleType>
+
     <xsd:complexType name="annotations">
         <xsd:attribute name="cache" type="xsd:string" />
         <xsd:attribute name="debug" type="xsd:string" />

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -162,7 +162,6 @@ protected static function getBundleDefaultConfig()
                 'enable_annotations' => !class_exists(FullStack::class),
                 'static_method' => array('loadValidatorMetadata'),
                 'translation_domain' => 'validators',
-                'strict_email' => false,
                 'mapping' => array(
                     'paths' => array(),
                 ),

diff --git a/...ameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_email_validation_mode.php b/...ameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_email_validation_mode.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', array(
+    'validation' => array(
+        'email_validation_mode' => 'html5',
+    ),
+));
diff --git a/...le/Tests/DependencyInjection/Fixtures/php/validation_strict_email_and_validation_mode.php b/...le/Tests/DependencyInjection/Fixtures/php/validation_strict_email_and_validation_mode.php
@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('framework', array(
+    'validation' => array(
+        'strict_email' => true,
+        'email_validation_mode' => 'strict',
+    ),
+));
diff --git a/...ameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_strict_email_disabled.php b/...ameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_strict_email_disabled.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', array(
+    'validation' => array(
+        'strict_email' => false,
+    ),
+));
diff --git a/...rameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_strict_email_enabled.php b/...rameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_strict_email_enabled.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', array(
+    'validation' => array(
+        'strict_email' => true,
+    ),
+));
diff --git a/...ameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_email_validation_mode.xml b/...ameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_email_validation_mode.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:validation email-validation-mode="html5" />
+    </framework:config>
+</container>
diff --git a/...le/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_and_validation_mode.xml b/...le/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_and_validation_mode.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:validation strict-email="true" email-validation-mode="strict" />
+    </framework:config>
+</container>
diff --git a/...ameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_disabled.xml b/...ameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_disabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:validation strict-email="false" />
+    </framework:config>
+</container>
diff --git a/...rameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_enabled.xml b/...rameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email_enabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:validation strict-email="true" />
+    </framework:config>
+</container>
diff --git a/...ameworkBundle/Tests/DependencyInjection/Fixtures/yml/validation_email_validation_mode.yml b/...ameworkBundle/Tests/DependencyInjection/Fixtures/yml/validation_email_validation_mode.yml
@@ -0,0 +1,3 @@
+framework:
+    validation:
+        email_validation_mode: html5
diff --git a/...le/Tests/DependencyInjection/Fixtures/yml/validation_strict_email_and_validation_mode.yml b/...le/Tests/DependencyInjection/Fixtures/yml/validation_strict_email_and_validation_mode.yml
@@ -0,0 +1,4 @@
+framework:
+    validation:
+        strict_email: true
+        email_validation_mode: html5
diff --git a/...ameworkBundle/Tests/DependencyInjection/Fixtures/yml/validation_strict_email_disabled.yml b/...ameworkBundle/Tests/DependencyInjection/Fixtures/yml/validation_strict_email_disabled.yml
@@ -0,0 +1,3 @@
+framework:
+    validation:
+        strict_email: false
diff --git a/...rameworkBundle/Tests/DependencyInjection/Fixtures/yml/validation_strict_email_enabled.yml b/...rameworkBundle/Tests/DependencyInjection/Fixtures/yml/validation_strict_email_enabled.yml
@@ -0,0 +1,3 @@
+framework:
+    validation:
+        strict_email: true
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -695,6 +695,46 @@ public function testValidationNoStaticMethod()
         // no cache, no annotations, no static methods
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation The "framework.validation.strict_email" configuration key has been deprecated in Symfony 4.1. Use the "framework.validation.email_validation_mode" configuration key instead.
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage "strict_email" and "email_validation_mode" cannot be used together.
+     */
+    public function testCannotConfigureStrictEmailAndEmailValidationModeAtTheSameTime()
+    {
+        $this->createContainerFromFile('validation_strict_email_and_validation_mode');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "framework.validation.strict_email" configuration key has been deprecated in Symfony 4.1. Use the "framework.validation.email_validation_mode" configuration key instead.
+     */
+    public function testEnabledStrictEmailOptionIsMappedToStrictEmailValidationMode()
+    {
+        $container = $this->createContainerFromFile('validation_strict_email_enabled');
+
+        $this->assertSame('strict', $container->getDefinition('validator.email')->getArgument(0));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "framework.validation.strict_email" configuration key has been deprecated in Symfony 4.1. Use the "framework.validation.email_validation_mode" configuration key instead.
+     */
+    public function testDisabledStrictEmailOptionIsMappedToLooseEmailValidationMode()
+    {
+        $container = $this->createContainerFromFile('validation_strict_email_disabled');
+
+        $this->assertSame('loose', $container->getDefinition('validator.email')->getArgument(0));
+    }
+
+    public function testEmailValidationModeIsPassedToEmailValidator()
+    {
+        $container = $this->createContainerFromFile('validation_email_validation_mode');
+
+        $this->assertSame('html5', $container->getDefinition('validator.email')->getArgument(0));
+    }
+
     public function testValidationMapping()
     {
         $container = $this->createContainerFromFile('validation_mapping');

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -48,7 +48,7 @@
         "symfony/stopwatch": "~3.4|~4.0",
         "symfony/translation": "~3.4|~4.0",
         "symfony/templating": "~3.4|~4.0",
-        "symfony/validator": "~3.4|~4.0",
+        "symfony/validator": "~4.1",
         "symfony/var-dumper": "~3.4|~4.0",
         "symfony/workflow": "~3.4|~4.0",
         "symfony/yaml": "~3.4|~4.0",
@@ -70,7 +70,7 @@
         "symfony/serializer": "<3.4",
         "symfony/stopwatch": "<3.4",
         "symfony/translation": "<3.4",
-        "symfony/validator": "<3.4",
+        "symfony/validator": "<4.1",
         "symfony/workflow": "<3.4"
     },
     "suggest": {