Unverified Commit d1e84f96 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3135305 by longwave: Remove Symfony 4.1 compatibility layer from EmailConstraint

(cherry picked from commit 45447b2f)
parent fe25fd4a
Loading
Loading
Loading
Loading
+1 −13
Original line number Diff line number Diff line
@@ -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);
  }