Compare commits

...

3 Commits

Author SHA1 Message Date
Eduardo Gulias Davis 04c6cdf987 Merge pull request #84 from egulias/82-brackets
#82 orphan brackets
2015-11-11 04:28:32 +01:00
Eduardo Gulias Davis cc9defe645 fixes #82 2015-11-11 04:24:15 +01:00
Eduardo Gulias Davis 50aaa0b18f Control tests for .com.xx domains 2015-11-11 03:59:45 +01:00
2 changed files with 10 additions and 2 deletions
@@ -103,6 +103,7 @@ class DomainPart extends Parser
{ {
$domain = ''; $domain = '';
$openedParenthesis = 0; $openedParenthesis = 0;
$openBrackets = false;
do { do {
$prev = $this->lexer->getPrevious(); $prev = $this->lexer->getPrevious();
@@ -130,7 +131,7 @@ class DomainPart extends Parser
$this->checkConsecutiveDots(); $this->checkConsecutiveDots();
$this->checkDomainPartExceptions($prev); $this->checkDomainPartExceptions($prev);
if ($this->hasBrackets()) { if ($openBrackets = $this->hasBrackets($openBrackets)) {
$this->parseDomainLiteral(); $this->parseDomainLiteral();
} }
@@ -287,8 +288,12 @@ class DomainPart extends Parser
} }
} }
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) { if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
return false; return false;
} }
@@ -63,6 +63,7 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
array('test@email^'), array('test@email^'),
array('test@email%'), array('test@email%'),
array('test@email$'), array('test@email$'),
array('test@email.com.au'),
); );
} }
@@ -123,6 +124,8 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
array('test@email>'), array('test@email>'),
array('test@email<'), array('test@email<'),
array('test@email{'), array('test@email{'),
array('test@email.com]'),
array('test@ema[il.com'),
); );
} }