Verified Commit 86cf98b5 authored by Andrei Mateescu's avatar Andrei Mateescu
Browse files

fix: #3521184 Email validation allows deprecated email addresses 

By: dcam
By: prabha1997
By: smustgrave
By: mmbk
By: annmarysruthy
By: cilefen
By: longwave
By: andypost
By: alexpott
By: tstoeckler
(cherry picked from commit 2d81003d)
parent f698f76d

core/lib/Drupal/Component/Utility/EmailValidator.php

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


use Egulias\EmailValidator\EmailValidator as EmailValidatorUtility;

use Egulias\EmailValidator\Validation\EmailValidation;

use Egulias\EmailValidator\Validation\RFCValidation;

use Egulias\EmailValidator\Validation\NoRFCWarningsValidation;



/**

 * Validates email addresses.
@@ -27,7 +27,7 @@ public function isValid($email, ?EmailValidation $email_validation = NULL) { 
    if ($email_validation) {

      throw new \BadMethodCallException('Calling \Drupal\Component\Utility\EmailValidator::isValid() with the second argument is not supported. See https://www.drupal.org/node/2997196');

    }

    return parent::isValid($email, (new RFCValidation()));

    return parent::isValid($email, (new NoRFCWarningsValidation()));

  }



}

core/lib/Drupal/Core/Command/InstallCommand.php

+2 −2
Original line number Diff line number Diff line
@@ -187,10 +187,10 @@ protected function install($class_loader, SymfonyStyle $io, $profile, $langcode, 
        ],

        'install_configure_form' => [

          'site_name' => $site_name,

          'site_mail' => 'drupal@localhost',

          'site_mail' => 'drupal@example.com',

          'account' => [

            'name' => 'admin',

            'mail' => 'admin@localhost',

            'mail' => 'admin@example.com',

            'pass' => [

              'pass1' => $password,

              'pass2' => $password,

core/tests/Drupal/Tests/Component/Utility/EmailValidatorTest.php

+3 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
namespace Drupal\Tests\Component\Utility;



use Drupal\Component\Utility\EmailValidator;

use Egulias\EmailValidator\Validation\RFCValidation;

use Egulias\EmailValidator\Validation\NoRFCWarningsValidation;

use PHPUnit\Framework\Attributes\CoversClass;

use PHPUnit\Framework\Attributes\Group;

use PHPUnit\Framework\TestCase;
@@ -29,6 +29,7 @@ public function testIsValid(): void { 
    $this->assertTrue($validator->isValid('example@example.com'));

    $this->assertFalse($validator->isValid('example@example.com@'));

    $this->assertFalse($validator->isValid('example@example .com'));

    $this->assertFalse($validator->isValid('example @example.com'));

  }



  /**
@@ -38,7 +39,7 @@ public function testIsValidException(): void { 
    $validator = new EmailValidator();

    $this->expectException(\BadMethodCallException::class);

    $this->expectExceptionMessage('Calling \Drupal\Component\Utility\EmailValidator::isValid() with the second argument is not supported. See https://www.drupal.org/node/2997196');

    $validator->isValid('example@example.com', (new RFCValidation()));

    $validator->isValid('example@example.com', (new NoRFCWarningsValidation()));

  }



}