Merge branch 'hotfix/66'

Close #66

Author: Xerkus

CHANGELOG.md

@@ -41,6 +41,8 @@ All notable changes to this project will be documented in this file, in reverse
   [#148](https://github.com/zendframework/zend-validator/pull/110) adds further
   `"suggest"` clauses in `composer.json`, since some dependencies are not always
   required, and may lead to runtime failures.
+- [#66](https://github.com/zendframework/zend-validator/pull/66) fixed
+  EmailAddress validator applying IDNA conversion to local part 
 
 
 ## 2.8.2 - 2017-01-29

src/EmailAddress.php

@@ -340,7 +340,7 @@ protected function validateLocalPart()
         // atext: ALPHA / DIGIT / and "!", "#", "$", "%", "&", "'", "*",
         //        "+", "-", "/", "=", "?", "^", "_", "`", "{", "|", "}", "~"
         $atext = 'a-zA-Z0-9\x21\x23\x24\x25\x26\x27\x2a\x2b\x2d\x2f\x3d\x3f\x5e\x5f\x60\x7b\x7c\x7d\x7e';
-        if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->idnToAscii($this->localPart))) {
+        if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->localPart)) {
             $result = true;
         } else {
             // Try quoted string format (RFC 5321 Chapter 4.1.2)
@@ -379,7 +379,7 @@ protected function validateMXRecords()
     {
         $mxHosts = [];
         $weight  = [];
-        $result = getmxrr($this->idnToAscii($this->hostname), $mxHosts, $weight);
+        $result = getmxrr($this->hostname, $mxHosts, $weight);
         if (! empty($mxHosts) && ! empty($weight)) {
             $this->mxRecord = array_combine($mxHosts, $weight) ?: [];
         } else {
@@ -473,7 +473,7 @@ protected function splitEmailParts($value)
         }
 
         $this->localPart = $matches[1];
-        $this->hostname  = $matches[2];
+        $this->hostname  = $this->idnToAscii($matches[2]);
 
         return true;
     }
@@ -497,7 +497,7 @@ public function isValid($value)
         }
 
         $length  = true;
-        $this->setValue($this->idnToUtf8($value));
+        $this->setValue($value);
 
         // Split email address up and disallow '..'
         if (! $this->splitEmailParts($this->getValue())) {

test/EmailAddressTest.php

@@ -220,7 +220,7 @@ public function testEmailDisplay()
     public function validEmailAddresses()
     {
         // @codingStandardsIgnoreStart
-        return [
+        $return = [
             '[email protected]'                                                          => ['[email protected]'],
             '[email protected]'                                                  => ['[email protected]'],
             '[email protected]'                                           => ['[email protected]'],
@@ -232,6 +232,13 @@ public function validEmailAddresses()
             'bob@verylongdomainsupercalifragilisticexpialidociousspoonfulofsugar.com' => ['bob@verylongdomainsupercalifragilisticexpialidociousspoonfulofsugar.com'],
             "B.O'[email protected]"                                                => ["B.O'[email protected]"],
         ];
+
+        if (extension_loaded('intl')) {
+            $return['bob@тест.рф']             = ['bob@тест.рф'];
+            $return['[email protected]'] = ['[email protected]'];
+        }
+
+        return $return;
         // @codingStandardsIgnoreEnd
     }
 
@@ -269,6 +276,7 @@ public function invalidEmailAddresses()
             'bob @ domain.com'                                                         => ['bob @ domain.com'],
             '[email protected]'                                                     => ['[email protected]'],
             '"bob%[email protected]'                                                    => ['"bob%[email protected]'],
+            'иван@письмо.рф'                                                           => ['иван@письмо.рф'],
             'multiline'                                                                => ['bob
 
             @domain.com'],
@@ -741,8 +749,8 @@ public function testUseMxCheckBasicValid()
         ];
 
         if (extension_loaded('intl')) {
-            $emailAddresses[] = 'иван@письмо.рф';
-            $emailAddresses[] = 'xn--@-7sbfxdyelgv5j.xn--p1ai';
+            $emailAddresses[] = 'test@письмо.рф';
+            $emailAddresses[] = 'test@xn--h1aigbl0e.xn--p1ai';
         }
 
         foreach ($emailAddresses as $input) {