diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php index 0a2b2d5946cc40f2222b07888c9608118f2922a6..d269b70ea1e5f57a11c9837b63f4b54c5017c54e 100644 --- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php +++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php @@ -20,19 +20,7 @@ class EmailConstraint extends Email { * {@inheritdoc} */ public function __construct($options = []) { - // Since Symfony 4.1, the 'mode' property is used, for previous versions the - // 'strict' property. If the 'strict' property is set, - // \Symfony\Component\Validator\Constraints\EmailValidator will trigger - // a deprecation error, so only assign a value for versions of Symfony - // < 4.2. This compatibility layer can be removed once Drupal requires - // Symfony 4.2 or higher in https://www.drupal.org/node/3009219. - if (property_exists($this, 'mode')) { - $default_options = ['mode' => 'strict']; - } - else { - $default_options = ['strict' => TRUE]; - } - $options += $default_options; + $options += ['mode' => 'strict']; parent::__construct($options); }