Use Token::$type directly if available

jsor · Feb 5, 2023 · d9a2bdd · d9a2bdd
1 parent 5be2d73
commit d9a2bdd
Show file tree

Hide file tree

Showing 49 changed files with 240 additions and 60 deletions.
diff --git a/src/Functions/ST_AddPoint.php b/src/Functions/ST_AddPoint.php
@@ -29,7 +29,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_Area.php b/src/Functions/ST_Area.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_AsBinary.php b/src/Functions/ST_AsBinary.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_AsEWKB.php b/src/Functions/ST_AsEWKB.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_AsGML.php b/src/Functions/ST_AsGML.php
@@ -25,27 +25,42 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_AsGeoJSON.php b/src/Functions/ST_AsGeoJSON.php
@@ -25,17 +25,26 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_AsHEXEWKB.php b/src/Functions/ST_AsHEXEWKB.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_AsLatLonText.php b/src/Functions/ST_AsLatLonText.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_AsSVG.php b/src/Functions/ST_AsSVG.php
@@ -25,12 +25,18 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_Box2dFromGeoHash.php b/src/Functions/ST_Box2dFromGeoHash.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_Buffer.php b/src/Functions/ST_Buffer.php
@@ -29,7 +29,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_Collect.php b/src/Functions/ST_Collect.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_DWithin.php b/src/Functions/ST_DWithin.php
@@ -33,7 +33,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_Distance.php b/src/Functions/ST_Distance.php
@@ -29,7 +29,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_DistanceSpheroid.php b/src/Functions/ST_DistanceSpheroid.php
@@ -29,7 +29,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_GeoHash.php b/src/Functions/ST_GeoHash.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_GeomCollFromText.php b/src/Functions/ST_GeomCollFromText.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_GeomFromGML.php b/src/Functions/ST_GeomFromGML.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_GeomFromGeoHash.php b/src/Functions/ST_GeomFromGeoHash.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_GeomFromText.php b/src/Functions/ST_GeomFromText.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_GeomFromWKB.php b/src/Functions/ST_GeomFromWKB.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_GeometryFromText.php b/src/Functions/ST_GeometryFromText.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_HausdorffDistance.php b/src/Functions/ST_HausdorffDistance.php
@@ -29,7 +29,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_IsValid.php b/src/Functions/ST_IsValid.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_IsValidDetail.php b/src/Functions/ST_IsValidDetail.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_IsValidReason.php b/src/Functions/ST_IsValidReason.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_Length.php b/src/Functions/ST_Length.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }

diff --git a/src/Functions/ST_LineFromText.php b/src/Functions/ST_LineFromText.php
@@ -25,7 +25,10 @@ public function parse(Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        if (($lexer->lookahead['type'] ?? null) === Lexer::T_COMMA) {
+        /** @psalm-suppress DeprecatedMethod */
+        $nextType = $lexer->lookahead['type'] ?? $lexer->lookahead->type ?? null;
+
+        if (Lexer::T_COMMA === $nextType) {
             $parser->match(Lexer::T_COMMA);
             $this->expressions[] = $parser->ArithmeticFactor();
         }