Merge pull request #84 from egulias/82-brackets

#82 orphan brackets
egulias · Nov 11, 2015 · 04c6cdf · 04c6cdf
2 parents de448a3 + cc9defe
commit 04c6cdf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Egulias/EmailValidator/Parser/DomainPart.php b/src/Egulias/EmailValidator/Parser/DomainPart.php
@@ -103,6 +103,7 @@ protected function doParseDomainPart()
     {
         $domain = '';
         $openedParenthesis = 0;
+        $openBrackets = false;
         do {
             $prev = $this->lexer->getPrevious();
 
@@ -130,7 +131,7 @@ protected function doParseDomainPart()
             $this->checkConsecutiveDots();
             $this->checkDomainPartExceptions($prev);
 
-            if ($this->hasBrackets()) {
+            if ($openBrackets = $this->hasBrackets($openBrackets)) {
                 $this->parseDomainLiteral();
             }
 
@@ -287,8 +288,12 @@ protected function checkDomainPartExceptions($prev)
         }
     }
 
-    protected function hasBrackets()
+    protected function hasBrackets($openBrackets)
     {
+        if ($this->lexer->token['type'] === EmailLexer::S_CLOSEBRACKET && !$openBrackets) {
+            throw new \InvalidArgumentException('ERR_EXPECTING_OPENBRACKET');
+        }
+
         if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
             return false;
         }

diff --git a/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php b/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
@@ -63,6 +63,7 @@ public function getValidEmails()
             array('test@email^'),
             array('test@email%'),
             array('test@email$'),
+            array('[email protected]'),
         );
     }
 
@@ -123,6 +124,8 @@ public function getInvalidEmails()
             array('test@email>'),
             array('test@email<'),
             array('test@email{'),
+            array('[email protected]]'),
+            array('test@ema[il.com'),
         );
     }