diff --git a/EmailValidator/Parser/DoubleQuote.php b/EmailValidator/Parser/DoubleQuote.php index dec6585..cb47861 100644 --- a/EmailValidator/Parser/DoubleQuote.php +++ b/EmailValidator/Parser/DoubleQuote.php @@ -17,7 +17,7 @@ class DoubleQuote extends Parser { $validQuotedString = $this->checkDQUOTE(); - if(!$validQuotedString->isValid()) return $validQuotedString; + if($validQuotedString->isInvalid()) return $validQuotedString; $special = array( EmailLexer::S_CR => true, @@ -55,7 +55,7 @@ class DoubleQuote extends Parser if ($prev['type'] === EmailLexer::S_BACKSLASH) { $validQuotedString = $this->checkDQUOTE(); - if(!$validQuotedString->isValid()) return $validQuotedString; + if($validQuotedString->isInvalid()) return $validQuotedString; } if (!$this->lexer->isNextToken(EmailLexer::S_AT) && $prev['type'] !== EmailLexer::S_BACKSLASH) { diff --git a/EmailValidator/Parser/LocalPart.php b/EmailValidator/Parser/LocalPart.php index 395cb99..a84dd21 100644 --- a/EmailValidator/Parser/LocalPart.php +++ b/EmailValidator/Parser/LocalPart.php @@ -28,7 +28,7 @@ class LocalPart extends Parser $dquoteParsingResult = $this->parseDoubleQuote(); //Invalid double quote parsing - if(!$dquoteParsingResult->isValid()) { + if($dquoteParsingResult->isInvalid()) { return $dquoteParsingResult; } } @@ -36,7 +36,7 @@ class LocalPart extends Parser if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS || $this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS ) { $result = $commentParser->parse('remove'); - if(!$result->isValid()) { + if($result->isInvalid()) { return $result; } $warns = $commentParser->getWarnings(); @@ -55,7 +55,7 @@ class LocalPart extends Parser //$this->warnEscaping(); $resultEscaping = $this->validateEscaping(); - if (!$resultEscaping->isValid()) { + if ($resultEscaping->isInvalid()) { return $resultEscaping; } diff --git a/EmailValidator/Result/InvalidEmail.php b/EmailValidator/Result/InvalidEmail.php index 30bc859..6d35b26 100644 --- a/EmailValidator/Result/InvalidEmail.php +++ b/EmailValidator/Result/InvalidEmail.php @@ -20,6 +20,11 @@ class InvalidEmail implements Result return false; } + public function isInvalid(): bool + { + return true; + } + public function description(): string { return $this->reason->description() . " in char " . $this->token; diff --git a/EmailValidator/Result/Result.php b/EmailValidator/Result/Result.php index 6b7893c..1e16bcc 100644 --- a/EmailValidator/Result/Result.php +++ b/EmailValidator/Result/Result.php @@ -9,6 +9,12 @@ interface Result */ public function isValid() : bool; + /** + * Is validation result invalid? + * Usually the inverse of isValid() + */ + public function isInvalid() : bool; + /** * Short description of the result, human readable. */ diff --git a/EmailValidator/Result/ValidEmail.php b/EmailValidator/Result/ValidEmail.php index e4be87f..4f3693a 100644 --- a/EmailValidator/Result/ValidEmail.php +++ b/EmailValidator/Result/ValidEmail.php @@ -9,6 +9,11 @@ class ValidEmail implements Result return true; } + public function isInvalid(): bool + { + return false; + } + public function description(): string { return "Valid email";