geckon01/EmailValidator
1
0
Fork 0
mirror of https://github.com/egulias/EmailValidator.git synced 2026-08-30 20:18:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

#4 - Fixed red tests

Browse Source
This commit is contained in:
Eduardo Gulias Davis
2013-06-30 15:52:59 +02:00
parent cfe6310bd8
commit 0cb5e361d5
3 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Egulias/EmailValidator/EmailParser.php
+9 -15
View File
@@ -45,19 +45,6 @@ class EmailParser
// Path = "<" [ A-d-l ":" ] Mailbox ">"
//
// http://tools.ietf.org/html/rfc5321#section-4.5.3.1.3
// The maximum total length of a reverse-path or forward-path is 256
// octets (including the punctuation and element separators).
//
// Thus, even without (obsolete) routing information, the Mailbox can
// only be 254 characters long. This is confirmed by this verified
// erratum to RFC 3696:
//
// http://www.rfc-editor.org/errata_search.php?rfc=3696&eid=1690
// However, there is a restriction in RFC 2821 on the length of an
// address in MAIL and RCPT commands of 254 characters. Since addresses
// that do not fit in those fields are not normally useful, the upper
// limit on address lengths should normally be considered to be 254.
//
// http://tools.ietf.org/html/rfc1035#section-2.3.4
$this->warnings[] = EmailValidator::RFC5322_TOOLONG;
}
@@ -91,9 +78,11 @@ class EmailParser
if ($this->lexer->token['type'] === EmailLexer::S_AT) {
throw new \InvalidArgumentException('ERR_CONSECUTIVEATS');
}
if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
throw new \InvalidArgumentException('ERR_DOT_START');
}
if ($this->lexer->token['type'] === EmailLexer::S_EMPTY) {
throw new \InvalidArgumentException('ERR_NODOMAIN');
}
@@ -107,6 +96,10 @@ class EmailParser
do {
$prev = $this->lexer->getPrevious();
if ($this->lexer->token['type'] === EmailLexer::S_AT) {
throw new \InvalidArgumentException('ERR_CONSECUTIVEATS');
}
if ($this->lexer->token['type'] === EmailLexer::S_OPENQBRACKET && $prev['type'] !== EmailLexer::S_AT) {
throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
}
@@ -331,7 +324,8 @@ class EmailParser
private function parseLocalPart()
{
$closingQuote = false;
while ($this->lexer->token['type'] !== EmailLexer::S_AT) {
while ($this->lexer->token['type'] !== EmailLexer::S_AT && $this->lexer->token) {
$previous = $this->lexer->getPrevious();
if ($this->lexer->token['type'] === EmailLexer::S_DOT && !$this->lexer->getPrevious()) {
throw new \InvalidArgumentException('ERR_DOT_START');
@@ -426,7 +420,7 @@ class EmailParser
}
$this->lexer->moveNext();
if ($this->lexer->isNextToken(EmailLexer::GENERIC)) {
if ($this->lexer->isNextToken(EmailLexer::GENERIC) || EmailLexer::S_EMPTY === $this->lexer->peek()) {
throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
}
tests/egulias/Tests/Constraints/EmailExtraValidatorTest.php
+2 -2
View File
@@ -65,6 +65,7 @@ class EmailExtraValidatorTest extends \PHPUnit_Framework_TestCase
array('fabien@symfony.com'),
array('example@example.co.uk'),
array('fabien_potencier@example.fr'),
array('example@localhost'),
);
}
@@ -91,9 +92,8 @@ class EmailExtraValidatorTest extends \PHPUnit_Framework_TestCase
public function getInvalidEmails()
{
return array(
//array('example'),
array('example'),
array('example@'),
//array('example@localhost'),
array('example@example.com@example.com'),
);
}
tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
+2 -1
View File
@@ -51,7 +51,8 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
{
return array(
array('example.@example.co.uk'),
//array('(fabien_potencier@example.fr)'),
array('example@example@example.co.uk'),
array('(fabien_potencier@example.fr)'),
array('example(example)example@example.co.uk'),
array('.example@localhost'),
array('ex\ample@localhost'),