WebSVN – lars-tiefland.laravel_shop – Diff – /trunk/vendor/egulias/email-validator/src/EmailLexer.php

 namespace Egulias\EmailValidator;
 use Doctrine\Common\Lexer\AbstractLexer;
-use Doctrine\Common\Lexer\Token;
+use Doctrine\Common\Lexer\Token;
-/**
  * @extends AbstractLexer<int, string>
- */
+/** @extends AbstractLexer<int, string> */
 class EmailLexer extends AbstractLexer
 {
     //ASCII values
-    public const S_EMPTY            = null;
+    public const S_EMPTY            = -1;
     public const C_NUL              = 0;
     public const S_HTAB             = 9;
     public const S_LF               = 10;
     public const S_OPENCURLYBRACES  = 123;
     public const S_PIPE             = 124;
     public const S_CLOSECURLYBRACES = 125;
     public const S_TILDE            = 126;
     public const C_DEL              = 127;
-    public const INVERT_QUESTIONMARK= 168;
+    public const INVERT_QUESTIONMARK = 168;
     public const INVERT_EXCLAMATION = 173;
     public const GENERIC            = 300;
     public const S_IPV6TAG          = 301;
     public const INVALID            = 302;
     public const CRLF               = 1310;
     /** @var bool */
     protected $hasInvalidTokens = false;
-    /**
-     * @var array
     /**
-     * @psalm-var array{value:string, type:null|int, position:int}|array<empty, empty>
+     * @var Token<int, string>
      */
-    protected $previous = [];
+    protected Token $previous;
     /**
-     * The last matched/seen token.
-     *
-     * @var array|Token
      * The last matched/seen token.
-     * @psalm-suppress NonInvariantDocblockPropertyType
+     *
-     * @psalm-var array{value:string, type:null|int, position:int}|Token<int, string>
+     * @var Token<int, string>
      */
-    public $token;
-    /**
-     * The next token in the input.
-     *
-     * @var array|Token|null
+    public Token $current;
-     *
-     * @psalm-suppress NonInvariantDocblockPropertyType
-     * @psalm-var array{position: int, type: int|null|string, value: int|string}|Token<int, string>|null
-     */
-    public $lookahead;
-    /** @psalm-var array{value:'', type:null, position:0} */
-    private static $nullToken = [
-        'value' => '',
+    /**
-        'type' => null,
+     * @var Token<int, string>
-        'position' => 0,
+     */
-    ];
+    private Token $nullToken;
     /** @var string */
+    private $accumulator = '';
+    /** @var bool */
+    private $hasToRecord = false;
-    private $accumulator = '';
     public function __construct()
     /** @var bool */
-    private $hasToRecord = false;
+        /** @var Token<int, string> $nullToken */
         $nullToken = new Token('', self::S_EMPTY, 0);
-    public function __construct()
+        $this->nullToken = $nullToken;
-        $this->previous = $this->token = self::$nullToken;
+        $this->current = $this->previous = $this->nullToken;
         $this->lookahead = null;
+    }
-    public function reset() : void
+    public function reset(): void
+    {
         $this->hasInvalidTokens = false;
         parent::reset();
-        $this->previous = $this->token = self::$nullToken;
+        $this->current = $this->previous = $this->nullToken;
     }
     /**
      * @param int $type
      * @throws \UnexpectedValueException
     /**
      * moveNext
+     *
      * @return boolean
      */
-    public function moveNext() : bool
+    public function moveNext(): bool
+    {
-        if ($this->hasToRecord && $this->previous === self::$nullToken) {
+        if ($this->hasToRecord && $this->previous === $this->nullToken) {
-            $this->accumulator .= $this->token['value'];
+            $this->accumulator .= $this->current->value;
+        }
-        $this->previous = $this->token instanceof Token
-            ? ['value' => $this->token->value, 'type' => $this->token->type, 'position' => $this->token->position]
-            : $this->token;
+        $this->previous = $this->current;
-        if($this->lookahead === null) {
+        if ($this->lookahead === null) {
-            $this->lookahead = self::$nullToken;
+            $this->lookahead = $this->nullToken;
+        }
         $hasNext = parent::moveNext();
-        $hasNext = parent::moveNext();
+        $this->current = $this->token ?? $this->nullToken;
         if ($this->hasToRecord) {
-            $this->accumulator .= $this->token['value'];
+            $this->accumulator .= $this->current->value;
+     *
      * @param string $value
      * @throws \InvalidArgumentException
      * @return integer
      */
-    protected function getType(&$value)
+    protected function getType(&$value): int
+    {
         $encoded = $value;
         if (mb_detect_encoding($value, 'auto', true) !== 'UTF-8') {
         if ($this->isInvalidChar($encoded)) {
             $this->hasInvalidTokens = true;
             return self::INVALID;
+        }
-        return  self::GENERIC;
+        return self::GENERIC;
     }
-    protected function isValid(string $value) : bool
+    protected function isValid(string $value): bool
+    {
         return isset($this->charValue[$value]);
+    }
-    protected function isNullType(string $value) : bool
+    protected function isNullType(string $value): bool
     {
         return $value === "\0";
+    }
-    protected function isInvalidChar(string $value) : bool
+    protected function isInvalidChar(string $value): bool
+    {
         return !preg_match(self::INVALID_CHARS_REGEX, $value);
+    }
-    protected function isUTF8Invalid(string $value) : bool
+    protected function isUTF8Invalid(string $value): bool
+    {
         return preg_match(self::VALID_UTF8_REGEX, $value) !== false;
+    }
-    public function hasInvalidTokens() : bool
+    public function hasInvalidTokens(): bool
     {
         return $this->hasInvalidTokens;
     }
     /**
      * getPrevious
+     *
-     * @return array
+     * @return Token<int, string>
      */
-    public function getPrevious() : array
+    public function getPrevious(): Token
+    {
         return $this->previous;
+    }
     /**
      * Lexical catchable patterns.
+     *
      * @return string[]
      */
-    protected function getCatchablePatterns() : array
+    protected function getCatchablePatterns(): array
     {
         return self::CATCHABLE_PATTERNS;
+    }
     /**
      * Lexical non-catchable patterns.
+     *
      * @return string[]
      */
-    protected function getNonCatchablePatterns() : array
+    protected function getNonCatchablePatterns(): array
+    {
         return self::NON_CATCHABLE_PATTERNS;
     }
-    protected function getModifiers() : string
+    protected function getModifiers(): string
+    {
         return self::MODIFIERS;
+    }
-    public function getAccumulatedValues() : string
+    public function getAccumulatedValues(): string
     {
         return $this->accumulator;
+    }
-    public function startRecording() : void
+    public function startRecording(): void

Subversion-Projekte lars-tiefland.laravel_shop

(root)/trunk/vendor/egulias/email-validator/src/EmailLexer.php – Revision 148 → 150