MAGETWO-82598: Fix Support for new Email address domain #4547 #11576

Author: Stanislav Idolov

app/code/Magento/Config/Model/Config/Backend/Email/Address.php

@@ -20,7 +20,8 @@ class Address extends \Magento\Framework\App\Config\Value
     public function beforeSave()
     {
         $value = $this->getValue();
-        if (!\Zend_Validate::is($value, 'EmailAddress')) {
+        $validator = new \Zend\Validator\EmailAddress();
+        if (!$validator->isValid($value)) {
             throw new LocalizedException(__('Please correct the email address: "%1".', $value));
         }
         return $this;

app/code/Magento/Contact/Controller/Index/Post.php

@@ -43,7 +43,8 @@ public function execute()
             if (!\Zend_Validate::is(trim($post['comment']), 'NotEmpty')) {
                 $error = true;
             }
-            if (!\Zend_Validate::is(trim($post['email']), 'EmailAddress')) {
+            $validator = new \Zend\Validator\EmailAddress();
+            if (!$validator->isValid(trim($post['email']))) {
                 $error = true;
             }
             if (\Zend_Validate::is(trim($post['hideit']), 'NotEmpty')) {

app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php

@@ -60,7 +60,8 @@ public function execute()
         $resultRedirect = $this->resultRedirectFactory->create();
         $email = (string)$this->getRequest()->getPost('email');
         if ($email) {
-            if (!\Zend_Validate::is($email, 'EmailAddress')) {
+            $validator = new \Zend\Validator\EmailAddress();
+            if (!$validator->isValid($email)) {
                 $this->session->setForgottenEmail($email);
                 $this->messageManager->addErrorMessage(__('Please correct the email address.'));
                 return $resultRedirect->setPath('*/*/forgotpassword');

app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php

@@ -231,8 +231,8 @@ protected function _checkUniqueKey(array $rowData, $rowNumber)
         } else {
             $email = strtolower($rowData[static::COLUMN_EMAIL]);
             $website = $rowData[static::COLUMN_WEBSITE];
-
-            if (!\Zend_Validate::is($email, 'EmailAddress')) {
+            $validator = new \Zend\Validator\EmailAddress();
+            if (!$validator->isValid($email)) {
                 $this->addRowError(static::ERROR_INVALID_EMAIL, $rowNumber, static::COLUMN_EMAIL);
             } elseif (!isset($this->_websiteCodeToId[$website])) {
                 $this->addRowError(static::ERROR_INVALID_WEBSITE, $rowNumber, static::COLUMN_WEBSITE);

app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php

@@ -100,7 +100,8 @@ protected function validateGuestSubscription()
      */
     protected function validateEmailFormat($email)
     {
-        if (!\Zend_Validate::is($email, 'EmailAddress')) {
+        $validator = new \Zend\Validator\EmailAddress();
+        if ($validator->isValid($email)) {
             throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a valid email address.'));
         }
     }

app/code/Magento/Quote/Model/Quote/Address/Validator.php

@@ -39,7 +39,8 @@ public function isValid($value)
     {
         $messages = [];
         $email = $value->getEmail();
-        if (!empty($email) && !\Zend_Validate::is($email, 'EmailAddress')) {
+        $validator = new \Zend\Validator\EmailAddress();
+        if (!empty($email) && !$validator->isValid($email)) {
             $messages['invalid_email_format'] = 'Invalid email format';
         }
 

app/code/Magento/SendFriend/Model/SendFriend.php

@@ -235,7 +235,8 @@ public function validate()
         }
 
         $email = $this->getSender()->getEmail();
-        if (empty($email) or !\Zend_Validate::is($email, 'EmailAddress')) {
+        $validator = new \Zend\Validator\EmailAddress();
+        if (empty($email) or !$validator->isValid($email)) {
             $errors[] = __('Invalid Sender Email');
         }
 
@@ -250,7 +251,7 @@ public function validate()
 
         // validate recipients email addresses
         foreach ($this->getRecipients()->getEmails() as $email) {
-            if (!\Zend_Validate::is($email, 'EmailAddress')) {
+            if (!$validator->isValid($email)) {
                 $errors[] = __('Please enter a correct recipient email address.');
                 break;
             }

app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php

@@ -44,7 +44,8 @@ public function execute()
         $resultRedirect = $this->resultRedirectFactory->create();
         if (!empty($email) && !empty($params)) {
             // Validate received data to be an email address
-            if (\Zend_Validate::is($email, 'EmailAddress')) {
+            $validator = new \Zend\Validator\EmailAddress();
+            if ($validator->isValid($email)) {
                 try {
                     $this->securityManager->performSecurityCheck(
                         \Magento\Security\Model\PasswordResetRequestEvent::ADMIN_PASSWORD_RESET_REQUEST,

app/code/Magento/Wishlist/Controller/Index/Send.php

@@ -153,7 +153,8 @@ public function execute()
                 } else {
                     foreach ($emails as $index => $email) {
                         $email = trim($email);
-                        if (!\Zend_Validate::is($email, 'EmailAddress')) {
+                        $validator = new \Zend\Validator\EmailAddress();
+                        if (!$validator->isValid($email)) {
                             $error = __('Please enter a valid email address.');
                             break;
                         }