Fix: #6008.5 failed and add composer.lock

Author: elachino

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

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

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

@@ -61,7 +61,7 @@ public function execute()
         $email = (string)$this->getRequest()->getPost('email');
         if ($email) {
             $validator = new \Zend\Validator\EmailAddress();
-           	if (!$validator->isValid($email)) {
+            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

@@ -232,8 +232,8 @@ protected function _checkUniqueKey(array $rowData, $rowNumber)
         } else {
             $email = strtolower($rowData[static::COLUMN_EMAIL]);
             $website = $rowData[static::COLUMN_WEBSITE];
-			$validator = new \Zend\Validator\EmailAddress();
-           	if (!$validator->isValid($email)) {
+            $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,8 +100,8 @@ protected function validateGuestSubscription()
      */
     protected function validateEmailFormat($email)
     {
-    	$validator = new \Zend\Validator\EmailAddress();
-    	if ($validator->isValid($email)) {
+        $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,7 @@ public function isValid($value)
     {
         $messages = [];
         $email = $value->getEmail();
-		$validator = new \Zend\Validator\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,7 @@ public function validate()
         }
 
         $email = $this->getSender()->getEmail();
-		$validator = new \Zend\Validator\EmailAddress();
+        $validator = new \Zend\Validator\EmailAddress();
         if (empty($email) or !$validator->isValid($email)) {
             $errors[] = __('Invalid Sender Email');
         }

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

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