geckon01/EmailValidator
1
0
Fork 0
mirror of https://github.com/egulias/EmailValidator.git synced 2026-09-11 18:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reducing complexity for domainPart

Browse Source
This commit is contained in:
Eduardo Gulias Davis
2014-05-08 17:53:51 +02:00
parent 978b27b10a
commit a80300a3ba
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Egulias/EmailValidator/EmailParser.php
+25 -12
View File
@@ -325,12 +325,7 @@ class EmailParser
throw new \InvalidArgumentException('ERR_DOMAINHYPHENEND');
}
if ($this->lexer->token['type'] === EmailLexer::S_OPENBRACKET) {
try {
$this->lexer->find(EmailLexer::S_CLOSEBRACKET);
} catch (\RuntimeException $e) {
throw new \InvalidArgumentException('ERR_EXPECTING_DOMLIT_CLOSE');
}
if ($this->hasBrackets()) {
$this->parseDomainLiteral();
}
@@ -339,12 +334,7 @@ class EmailParser
throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
}
if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
$prev['type'] === EmailLexer::GENERIC &&
strlen($prev['value']) > 63
) {
$this->warnings[] = EmailValidator::RFC5322_LABEL_TOOLONG;
}
$this->checkLabelLength($prev);
if ($this->isFWS()) {
$this->parseFWS();
@@ -485,4 +475,27 @@ class EmailParser
$this->warnings[] = EmailValidator::RFC5321_IPV6DEPRECATED;
}
}
private function checkLabelLength($prev)
{
if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
$prev['type'] === EmailLexer::GENERIC &&
strlen($prev['value']) > 63
) {
$this->warnings[] = EmailValidator::RFC5322_LABEL_TOOLONG;
}
}
private function hasBrackets()
{
if ($this->lexer->token['type'] === EmailLexer::S_OPENBRACKET) {
try {
$this->lexer->find(EmailLexer::S_CLOSEBRACKET);
} catch (\RuntimeException $e) {
throw new \InvalidArgumentException('ERR_EXPECTING_DOMLIT_CLOSE');
}
return true;
}
}
}