From 46383ef57a7b50d0944734bc6d6a0f14c2be42e3 Mon Sep 17 00:00:00 2001 From: Eduardo Gulias Davis Date: Thu, 3 Jul 2014 12:19:54 +0200 Subject: [PATCH] [WIP] - ordering classes --- src/Egulias/EmailValidator/EmailValidator.php | 4 +--- src/Egulias/EmailValidator/Parser/DomainPart.php | 2 +- src/Egulias/EmailValidator/Parser/LocalPart.php | 2 +- src/Egulias/EmailValidator/{ => Parser}/Parser.php | 4 +++- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/Egulias/EmailValidator/{ => Parser}/Parser.php (97%) diff --git a/src/Egulias/EmailValidator/EmailValidator.php b/src/Egulias/EmailValidator/EmailValidator.php index bf1a3c6..877d422 100644 --- a/src/Egulias/EmailValidator/EmailValidator.php +++ b/src/Egulias/EmailValidator/EmailValidator.php @@ -35,7 +35,6 @@ class EmailValidator const ERR_FWS_CRLF_END = 149; const ERR_CR_NO_LF = 150; const ERR_DEPREC_REACHED = 151; - const RFC5321_TLD = 9; const RFC5321_TLDNUMERIC = 10; const RFC5321_QUOTEDSTRING = 11; @@ -70,7 +69,6 @@ class EmailValidator protected $warnings = array(); protected $error; protected $threshold = 255; - protected $emailParts = array(); public function __construct() { @@ -81,7 +79,6 @@ class EmailValidator { try { $this->parser->parse((string)$email); - $this->emailParts = explode('@', $email); $this->warnings = $this->parser->getWarnings(); } catch (\Exception $e) { $rClass = new \ReflectionClass($this); @@ -93,6 +90,7 @@ class EmailValidator if ($checkDNS) { $dns = $this->checkDNS(); } + if ($this->hasWarnings() && ((int) max($this->warnings) > $this->threshold)) { $this->error = self::ERR_DEPREC_REACHED; diff --git a/src/Egulias/EmailValidator/Parser/DomainPart.php b/src/Egulias/EmailValidator/Parser/DomainPart.php index e83f958..ce3756c 100644 --- a/src/Egulias/EmailValidator/Parser/DomainPart.php +++ b/src/Egulias/EmailValidator/Parser/DomainPart.php @@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Parser; use Egulias\EmailValidator\EmailLexer; -use Egulias\EmailValidator\Parser; +use Egulias\EmailValidator\Parser\Parser; use Egulias\EmailValidator\EmailValidator; class DomainPart extends Parser diff --git a/src/Egulias/EmailValidator/Parser/LocalPart.php b/src/Egulias/EmailValidator/Parser/LocalPart.php index 1855963..2d24619 100644 --- a/src/Egulias/EmailValidator/Parser/LocalPart.php +++ b/src/Egulias/EmailValidator/Parser/LocalPart.php @@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Parser; use Egulias\EmailValidator\EmailLexer; -use Egulias\EmailValidator\Parser; +use Egulias\EmailValidator\Parser\Parser; use Egulias\EmailValidator\EmailValidator; /** diff --git a/src/Egulias/EmailValidator/Parser.php b/src/Egulias/EmailValidator/Parser/Parser.php similarity index 97% rename from src/Egulias/EmailValidator/Parser.php rename to src/Egulias/EmailValidator/Parser/Parser.php index 790acba..3f4b3e3 100644 --- a/src/Egulias/EmailValidator/Parser.php +++ b/src/Egulias/EmailValidator/Parser/Parser.php @@ -1,7 +1,9 @@