ci: Add tests for PHP 8.4

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3', '8.4']
         deps: [highest]
 
         include:

composer.json

@@ -19,7 +19,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^10.2",
-    "vimeo/psalm": "^5.12"
+    "vimeo/psalm": "^5.26.1 || ^6.8.8"
   },
   "suggest": {
     "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"

src/EmailLexer.php

@@ -6,7 +6,7 @@
 use Doctrine\Common\Lexer\Token;
 
 /** @extends AbstractLexer<int, string> */
-class EmailLexer extends AbstractLexer
+final class EmailLexer extends AbstractLexer
 {
     //ASCII values
     public const S_EMPTY            = -1;
@@ -165,7 +165,7 @@
         $this->lookahead = null;
     }
 
     public function reset(): void
     {
         $this->hasInvalidTokens = false;
         parent::reset();
@@ -194,7 +194,7 @@
      *
      * @return boolean
      */
     public function moveNext(): bool
     {
         if ($this->hasToRecord && $this->previous === $this->nullToken) {
             $this->accumulator .= $this->current->value;
@@ -223,7 +223,7 @@
      * @throws \InvalidArgumentException
      * @return integer
      */
     protected function getType(&$value): int
     {
         $encoded = $value;
 
@@ -231,15 +231,15 @@
             $encoded = mb_convert_encoding($value, 'UTF-8', 'Windows-1252');
         }
 
         if ($this->isValid($encoded)) {
             return $this->charValue[$encoded];
         }
 
         if ($this->isNullType($encoded)) {
             return self::C_NUL;
         }
 
         if ($this->isInvalidChar($encoded)) {
             $this->hasInvalidTokens = true;
             return self::INVALID;
         }
@@ -287,7 +287,7 @@
      *
      * @return string[]
      */
     protected function getCatchablePatterns(): array
     {
         return self::CATCHABLE_PATTERNS;
     }
@@ -297,12 +297,12 @@
      *
      * @return string[]
      */
     protected function getNonCatchablePatterns(): array
     {
         return self::NON_CATCHABLE_PATTERNS;
     }
 
     protected function getModifiers(): string
     {
         return self::MODIFIERS;
     }

src/EmailParser.php

@@ -10,7 +10,7 @@
 use Egulias\EmailValidator\Warning\EmailTooLong;
 use Egulias\EmailValidator\Result\Reason\NoLocalPart;
 
-class EmailParser extends Parser
+final class EmailParser extends Parser
 {
     public const EMAIL_MAX_LENGTH = 254;
 

src/EmailValidator.php

@@ -5,7 +5,7 @@
 use Egulias\EmailValidator\Result\InvalidEmail;
 use Egulias\EmailValidator\Validation\EmailValidation;
 
-class EmailValidator
+final class EmailValidator
 {
     /**
      * @var EmailLexer

src/MessageIDParser.php

@@ -10,7 +10,7 @@
 use Egulias\EmailValidator\Warning\EmailTooLong;
 use Egulias\EmailValidator\Result\Reason\NoLocalPart;
 
-class MessageIDParser extends Parser
+final class MessageIDParser extends Parser
 {
 
     public const EMAILID_MAX_LENGTH = 254;

src/Parser/Comment.php

@@ -11,7 +11,7 @@
 use Egulias\EmailValidator\Result\Reason\UnOpenedComment;
 use Egulias\EmailValidator\Warning\Comment as WarningComment;
 
-class Comment extends PartParser
+final class Comment extends PartParser
 {
     /**
      * @var int

src/Parser/CommentStrategy/DomainComment.php

@@ -8,7 +8,7 @@
 use Egulias\EmailValidator\Result\InvalidEmail;
 use Egulias\EmailValidator\Result\Reason\ExpectingATEXT;
 
-class DomainComment implements CommentStrategy
+final class DomainComment implements CommentStrategy
 {
     public function exitCondition(EmailLexer $lexer, int $openedParenthesis): bool
     {

src/Parser/CommentStrategy/LocalComment.php

@@ -10,7 +10,7 @@
 use Egulias\EmailValidator\Result\Reason\ExpectingATEXT;
 use Egulias\EmailValidator\Warning\Warning;
 
-class LocalComment implements CommentStrategy
+final class LocalComment implements CommentStrategy
 {
     /**
      * @var array<int, Warning>

src/Parser/DomainLiteral.php

@@ -21,7 +21,7 @@
 use Egulias\EmailValidator\Result\Reason\UnusualElements;
 use Egulias\EmailValidator\Warning\DomainLiteral as WarningDomainLiteral;
 
-class DomainLiteral extends PartParser
+final class DomainLiteral extends PartParser
 {
     public const IPV4_REGEX = '/\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/';
 

src/Parser/DoubleQuote.php

@@ -11,7 +11,7 @@
 use Egulias\EmailValidator\Result\Reason\UnclosedQuotedString;
 use Egulias\EmailValidator\Result\Result;
 
-class DoubleQuote extends PartParser
+final class DoubleQuote extends PartParser
 {
     public function parse(): Result
     {

src/Parser/FoldingWhiteSpace.php

@@ -14,7 +14,7 @@
 use Egulias\EmailValidator\Result\Result;
 use Egulias\EmailValidator\Result\ValidEmail;
 
-class  FoldingWhiteSpace extends PartParser
+final class FoldingWhiteSpace extends PartParser
 {
     public const FWS_TYPES = [
         EmailLexer::S_SP,

src/Parser/IDLeftPart.php

@@ -6,7 +6,7 @@
 use Egulias\EmailValidator\Result\InvalidEmail;
 use Egulias\EmailValidator\Result\Reason\CommentsInIDRight;
 
-class IDLeftPart extends LocalPart
+final class IDLeftPart extends LocalPart
 {
     protected function parseComments(): Result
     {

src/Parser/IDRightPart.php

@@ -8,7 +8,7 @@
 use Egulias\EmailValidator\Result\InvalidEmail;
 use Egulias\EmailValidator\Result\Reason\ExpectingATEXT;
 
-class IDRightPart extends DomainPart
+final class IDRightPart extends DomainPart
 {
     protected function validateTokens(bool $hasComments): Result
     {

src/Result/MultipleErrors.php

@@ -8,7 +8,7 @@
 /**
  * @psalm-suppress PropertyNotSetInConstructor
  */
-class MultipleErrors extends InvalidEmail
+final class MultipleErrors extends InvalidEmail
 {
     /**
      * @var Reason[]

src/Result/Reason/AtextAfterCFWS.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class AtextAfterCFWS implements Reason
+final class AtextAfterCFWS implements Reason
 {
     public function code() : int
     {

src/Result/Reason/CRLFAtTheEnd.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class CRLFAtTheEnd implements Reason
+final class CRLFAtTheEnd implements Reason
 {
     public const CODE = 149;
     public const REASON = "CRLF at the end";

src/Result/Reason/CRLFX2.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class CRLFX2 implements Reason
+final class CRLFX2 implements Reason
 {
     public function code() : int
     {

src/Result/Reason/CRNoLF.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class CRNoLF implements Reason
+final class CRNoLF implements Reason
 {
     public function code() : int
     {

src/Result/Reason/CharNotAllowed.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class CharNotAllowed implements Reason
+final class CharNotAllowed implements Reason
 {
     public function code() : int
     {

src/Result/Reason/CommaInDomain.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class CommaInDomain implements Reason
+final class CommaInDomain implements Reason
 {
     public function code() : int
     {

src/Result/Reason/CommentsInIDRight.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class CommentsInIDRight implements Reason
+final class CommentsInIDRight implements Reason
 {
     public function code() : int
     {

src/Result/Reason/ConsecutiveAt.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class ConsecutiveAt implements Reason
+final class ConsecutiveAt implements Reason
 {
     public function code() : int
     {

src/Result/Reason/ConsecutiveDot.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class ConsecutiveDot implements Reason
+final class ConsecutiveDot implements Reason
 {
     public function code() : int
     {

src/Result/Reason/DomainAcceptsNoMail.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class DomainAcceptsNoMail implements Reason
+final class DomainAcceptsNoMail implements Reason
 {
     public function code() : int
     {

src/Result/Reason/DomainHyphened.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class DomainHyphened extends DetailedReason
+final class DomainHyphened extends DetailedReason
 {
     public function code() : int
     {

src/Result/Reason/DomainTooLong.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class DomainTooLong implements Reason
+final class DomainTooLong implements Reason
 {
     public function code() : int
     {

src/Result/Reason/DotAtEnd.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class DotAtEnd implements Reason
+final class DotAtEnd implements Reason
 {
     public function code() : int
     {

src/Result/Reason/DotAtStart.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class DotAtStart implements Reason
+final class DotAtStart implements Reason
 {
     public function code() : int
     {

src/Result/Reason/EmptyReason.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class EmptyReason implements Reason
+final class EmptyReason implements Reason
 {
     public function code() : int
     {

src/Result/Reason/ExceptionFound.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class ExceptionFound implements Reason
+final class ExceptionFound implements Reason
 {
     /**
      * @var \Exception

src/Result/Reason/ExpectingATEXT.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class ExpectingATEXT extends DetailedReason
+final class ExpectingATEXT extends DetailedReason
 {
     public function code() : int
     {

src/Result/Reason/ExpectingCTEXT.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class ExpectingCTEXT implements Reason
+final class ExpectingCTEXT implements Reason
 {
     public function code() : int
     {

src/Result/Reason/ExpectingDTEXT.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class ExpectingDTEXT implements Reason
+final class ExpectingDTEXT implements Reason
 {
     public function code() : int
     {

src/Result/Reason/ExpectingDomainLiteralClose.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class ExpectingDomainLiteralClose implements Reason
+final class ExpectingDomainLiteralClose implements Reason
 {
     public function code() : int
     {

src/Result/Reason/LabelTooLong.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class LabelTooLong implements Reason
+final class LabelTooLong implements Reason
 {
     public function code() : int
     {

src/Result/Reason/LocalOrReservedDomain.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class LocalOrReservedDomain implements Reason
+final class LocalOrReservedDomain implements Reason
 {
     public function code() : int
     {

src/Result/Reason/NoDomainPart.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class NoDomainPart implements Reason
+final class NoDomainPart implements Reason
 {
     public function code() : int
     {

src/Result/Reason/NoLocalPart.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class NoLocalPart implements Reason 
+final class NoLocalPart implements Reason
 {
     public function code() : int
     {

src/Result/Reason/RFCWarnings.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class RFCWarnings implements Reason
+final class RFCWarnings implements Reason
 {
     public function code() : int
     {

src/Result/Reason/SpoofEmail.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class SpoofEmail implements Reason
+final class SpoofEmail implements Reason
 {
     public function code() : int
     {

src/Result/Reason/UnOpenedComment.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class UnOpenedComment implements Reason
+final class UnOpenedComment implements Reason
 {
     public function code() : int
     {

src/Result/Reason/UnableToGetDNSRecord.php

@@ -5,7 +5,7 @@
 /**
  * Used on SERVFAIL, TIMEOUT or other runtime and network errors
  */
-class UnableToGetDNSRecord extends NoDNSRecord
+final class UnableToGetDNSRecord extends NoDNSRecord
 {
     public function code() : int
     {

src/Result/Reason/UnclosedComment.php

@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Result\Reason;
 
-class UnclosedComment implements Reason 
+final class UnclosedComment implements Reason
 {
     public function code() : int
     {