Apply feedbacks

Author: Ph0tonic

src/EmailLexer.php

@@ -133,30 +133,23 @@ class EmailLexer extends AbstractLexer
 
     /**
      * @var Token
-     *
-     * @psalm-var array{value:string, type:null|int, position:int}|array<empty, empty>
      */
     protected $previous = null;
 
     /**
      * The last matched/seen token.
      *
-     * @var object
-     *
-     * @psalm-suppress NonInvariantDocblockPropertyType
-     * @psalm-var array{value:string, type:null|int, position:int}
-     * @psalm-suppress NonInvariantDocblockPropertyType
+     * @var Token
      */
     public $token;
 
     /**
      * The next token in the input.
      *
-     * @var array{position: int, type: int|null|string, value: int|string}|null
+     * @var Token|null
      */
     public $lookahead;
 
-    /** @psalm-var array{value:'', type:null, position:0} */
     private $nullToken = null;
 
     /** @var string */
@@ -283,9 +276,9 @@ public function hasInvalidTokens(): bool
     /**
      * getPrevious
      *
-     * @return object
+     * @return Token
      */
-    public function getPrevious(): object
+    public function getPrevious(): Token
     {
         return $this->previous;
     }

src/Parser/DomainPart.php

@@ -2,6 +2,7 @@
 
 namespace Egulias\EmailValidator\Parser;
 
+use Doctrine\Common\Lexer\Token;
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Warning\TLD;
 use Egulias\EmailValidator\Result\Result;
@@ -81,11 +82,11 @@ private function checkEndOfDomain(): Result
             return new InvalidEmail(new DotAtEnd(), $this->lexer->token->value);
         }
         if ($prev->isA(EmailLexer::S_HYPHEN)) {
-            return new InvalidEmail(new DomainHyphened('Hypen found at the end of the domain'), $prev['value']);
+            return new InvalidEmail(new DomainHyphened('Hypen found at the end of the domain'), $prev->value);
         }
 
         if ($this->lexer->token->isA(EmailLexer::S_SP)) {
-            return new InvalidEmail(new CRLFAtTheEnd(), $prev['value']);
+            return new InvalidEmail(new CRLFAtTheEnd(), $prev->value);
         }
         return new ValidEmail();
     }
@@ -212,7 +213,7 @@ protected function doParseDomainPart(): Result
         return new ValidEmail();
     }
 
-    private function checkNotAllowedChars(object $token): Result
+    private function checkNotAllowedChars(Token $token): Result
     {
         $notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH => true];
         if (isset($notAllowed[$token->type])) {
@@ -238,7 +239,7 @@ protected function parseDomainLiteral(): Result
         return $result;
     }
 
-    protected function checkDomainPartExceptions(object $prev, bool $hasComments): Result
+    protected function checkDomainPartExceptions(Token $prev, bool $hasComments): Result
     {
         if ($this->lexer->token->isA(EmailLexer::S_OPENBRACKET) && $prev->type !== EmailLexer::S_AT) {
             return new InvalidEmail(new ExpectingATEXT('OPENBRACKET not after AT'), $this->lexer->token->value);

src/Validation/DNSCheckValidation.php

@@ -179,7 +179,7 @@ private function validateMxRecord($dnsRecord): bool
         }
 
         // "Null MX" record indicates the domain accepts no mail (https://tools.ietf.org/html/rfc7505)
-        if (empty($dnsRecord['target']) || $dnsRecord['target'] === '.') {
+        if (empty($dnsRecord->target) || $dnsRecord->target === '.') {
             $this->error = new InvalidEmail(new DomainAcceptsNoMail(), "");
             return false;
         }