ExpectingATEXT

src/Egulias/EmailValidator/EmailValidator.php

@@ -11,7 +11,6 @@ use Egulias\EmailValidator\InvalidEmail;
  */
 class EmailValidator
 {
-    const ERR_EXPECTING_ATEXT    = 137;
     const ERR_EXPECTING_QTEXT    = 138;
     const ERR_EXPECTING_CTEXT    = 139;
     const ERR_BACKSLASHEND       = 140;

src/Egulias/EmailValidator/Exception/ExpectingATEXT.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+use Egulias\EmailValidator\InvalidEmail;
+
+class ExpectingATEXT extends InvalidEmail
+{
+    const CODE = 137;
+    const REASON = "Expecting ATEXT";
+}

src/Egulias/EmailValidator/Parser/DomainPart.php

@@ -6,6 +6,8 @@ namespace Egulias\EmailValidator\Parser;
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Exception\ConsecutiveAt;
 use Egulias\EmailValidator\Exception\DotAtStart;
+use Egulias\EmailValidator\Exception\ExpectedQPair;
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
 use Egulias\EmailValidator\Exception\ExpectingDTEXT;
 use Egulias\EmailValidator\Exception\NoDomainPart;
 use Egulias\EmailValidator\Parser\Parser;
@@ -255,7 +257,7 @@ class DomainPart extends Parser
         );
 
         if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
+            throw new ExpectingATEXT();
         }
 
         if ($this->lexer->token['type'] === EmailLexer::S_COMMA) {
@@ -267,7 +269,7 @@ class DomainPart extends Parser
         }
 
         if ($this->lexer->token['type'] === EmailLexer::S_OPENQBRACKET && $prev['type'] !== EmailLexer::S_AT) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
+            throw new ExpectingATEXT();
         }
 
         if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
@@ -276,7 +278,7 @@ class DomainPart extends Parser
 
         if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH
             && $this->lexer->isNextToken(EmailLexer::GENERIC)) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
+            throw new ExpectingATEXT();
         }
     }
 
@@ -315,7 +317,7 @@ class DomainPart extends Parser
 
         $this->lexer->moveNext();
         if ($this->lexer->isNextToken(EmailLexer::S_DOT)) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
+            throw new ExpectingATEXT();
         }
     }
 }

src/Egulias/EmailValidator/Parser/LocalPart.php

@@ -5,6 +5,7 @@ namespace Egulias\EmailValidator\Parser;
 use Egulias\EmailValidator\Exception\DotAtStart;
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
 use \InvalidArgumentException;
 
 class LocalPart extends Parser
@@ -116,7 +117,7 @@ class LocalPart extends Parser
         );
 
         if (in_array($token['type'], $forbidden) && !$closingQuote) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
+            throw new ExpectingATEXT();
         }
     }
 }

src/Egulias/EmailValidator/Parser/Parser.php

@@ -7,6 +7,7 @@ use Egulias\EmailValidator\EmailValidator;
 use Egulias\EmailValidator\Exception\AtextAfterCFWS;
 use Egulias\EmailValidator\Exception\ConsecutiveDot;
 use Egulias\EmailValidator\Exception\ExpectedQPair;
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
 
 abstract class Parser
 {
@@ -53,7 +54,7 @@ abstract class Parser
 
         $this->lexer->moveNext();
         if ($this->lexer->isNextTokenAny(array(EmailLexer::GENERIC, EmailLexer::S_EMPTY))) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
+            throw new ExpectingATEXT();
         }
 
         if ($this->lexer->isNextToken(EmailLexer::S_AT)) {
@@ -142,7 +143,7 @@ abstract class Parser
         }
 
         if ($this->lexer->isNextToken(EmailLexer::GENERIC)) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
+            throw new ExpectingATEXT();
         }
 
         if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB, EmailLexer::C_DEL))) {
@@ -164,7 +165,7 @@ abstract class Parser
         }
         $previous = $this->lexer->getPrevious();
         if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] === EmailLexer::GENERIC) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
+            throw new ExpectingATEXT();
         }
 
         $this->warnings[] = EmailValidator::RFC5321_QUOTEDSTRING;

tests/egulias/Tests/EmailValidator/EmailValidatorTest.php

@@ -7,6 +7,7 @@ use Egulias\EmailValidator\Exception\AtextAfterCFWS;
 use Egulias\EmailValidator\Exception\ConsecutiveAt;
 use Egulias\EmailValidator\Exception\ConsecutiveDot;
 use Egulias\EmailValidator\Exception\DotAtStart;
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
 use Egulias\EmailValidator\Exception\ExpectingDTEXT;
 use Egulias\EmailValidator\Exception\NoDomainPart;
 use Egulias\EmailValidator\Exception\NoLocalPart;
@@ -153,14 +154,14 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
             array(ConsecutiveAt::CODE, 'example@@example.co.uk'),
             array(ConsecutiveDot::CODE, 'example..example@example.co.uk'),
             array(ConsecutiveDot::CODE, 'example@example..co.uk'),
-            array(EmailValidator::ERR_EXPECTING_ATEXT, '<fabien_potencier>@example.fr'),
+            array(ExpectingATEXT::CODE, '<fabien_potencier>@example.fr'),
             array(DotAtStart::CODE, '.example@localhost'),
             array(DotAtStart::CODE, 'example@.localhost'),
             array(EmailValidator::ERR_DOT_END, 'example@localhost.'),
             array(EmailValidator::ERR_DOT_END, 'example.@example.co.uk'),
             array(EmailValidator::ERR_UNCLOSEDCOMMENT, '(example@localhost'),
             array(EmailValidator::ERR_UNCLOSEDQUOTEDSTR, '"example@localhost'),
-            array(EmailValidator::ERR_EXPECTING_ATEXT, 'exa"mple@localhost'),
+            array(ExpectingATEXT::CODE, 'exa"mple@localhost'),
             //This was the original. But atext is not allowed after \n
             //array(EmailValidator::ERR_EXPECTING_ATEXT, "exampl\ne@example.co.uk"),
             array(AtextAfterCFWS::CODE, "exampl\ne@example.co.uk"),