EmailValidator with IDN fails on hyphen #2

mapeveri · Nov 22, 2020 · 44ff9b5 · 44ff9b5
1 parent 9f02bd6
commit 44ff9b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/Rule/Email.php b/src/Rule/Email.php
@@ -53,6 +53,7 @@ class Email extends Rule
 
     protected function validateValue($value, DataSetInterface $dataSet = null): Result
     {
+        $originalValue = $value;
         $result = new Result();
 
         if (!is_string($value)) {
@@ -93,6 +94,10 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
             }
         }
 
+        if ($this->enableIDN && $valid === false) {
+            $valid = filter_var($originalValue, FILTER_VALIDATE_EMAIL) ? true : false;
+        }
+
         if ($valid === false) {
             $result->addError($this->translateMessage($this->message));
         }

diff --git a/tests/Rule/EmailTest.php b/tests/Rule/EmailTest.php
@@ -75,6 +75,7 @@ public function testValidateIdn(): void
             ->enableIDN(true);
 
         $this->assertTrue($validator->validate('5011@example.com')->isValid());
+        $this->assertTrue($validator->validate('test-@dummy.com')->isValid());
         $this->assertTrue($validator->validate('example@äüößìà.de')->isValid());
         $this->assertTrue($validator->validate('example@xn--zcack7ayc9a.de')->isValid());
         $this->assertTrue($validator->validate('info@örtliches.de')->isValid());