Bump phpstan from 1.x to 2.1+ and remove unnecessary psalm annotations

php-type-language · Jan 10, 2025 · f94a017 · f94a017
1 parent 200c46c
commit f94a017
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -23,8 +23,7 @@
         "friendsofphp/php-cs-fixer": "^3.53",
         "jetbrains/phpstorm-attributes": "^1.0",
         "phplrt/compiler": "^3.7",
-        "phpstan/phpstan": "^2.0",
-        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan": "^2.1",
         "phpstan/phpstan-strict-rules": "^2.0",
         "phpunit/phpunit": "^10.5|^11.0",
         "rector/rector": "^1.1"

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,6 +1,5 @@
 includes:
   - phar://phpstan.phar/conf/bleedingEdge.neon
-  - vendor/phpstan/phpstan-deprecation-rules/rules.neon
   - vendor/phpstan/phpstan-strict-rules/rules.neon
 parameters:
   level: max

diff --git a/src/Node/Literal/StringLiteralNode.php b/src/Node/Literal/StringLiteralNode.php
@@ -137,11 +137,8 @@ private static function renderEscapeSequences(string $body): string
      */
     private static function renderHexadecimalSequences(string $body): string
     {
-        $callee = static fn(array $matches): string
-            => \chr((int) \hexdec((string) $matches[1]))
-        ;
-
-        return @\preg_replace_callback(self::HEX_SEQUENCE_PATTERN, $callee, $body) ?? $body;
+        return @\preg_replace_callback(self::HEX_SEQUENCE_PATTERN, static fn(array $matches): string
+            => \chr((int) \hexdec($matches[1])), $body) ?? $body;
     }
 
     /**
@@ -152,8 +149,8 @@ private static function renderHexadecimalSequences(string $body): string
      */
     private static function renderUtfSequences(string $body): string
     {
-        $callee = static function (array $matches): string {
-            $code = (int) \hexdec((string) $matches[1]);
+        return @\preg_replace_callback(self::UTF_SEQUENCE_PATTERN, static function (array $matches): string {
+            $code = (int) \hexdec($matches[1]);
 
             // @phpstan-ignore-next-line : PHPStan false-positive mb_chr evaluation
             if (\function_exists('\\mb_chr') && ($result = \mb_chr($code)) !== false) {
@@ -179,9 +176,7 @@ private static function renderUtfSequences(string $body): string
                 . \chr(0x80 | $code >> 12 & 0x3F)
                 . \chr(0x80 | $code >> 6 & 0x3F)
                 . \chr(0x80 | $code & 0x3F);
-        };
-
-        return @\preg_replace_callback(self::UTF_SEQUENCE_PATTERN, $callee, $body) ?? $body;
+        }, $body) ?? $body;
     }
 
     public function getValue(): string

diff --git a/src/Parser.php b/src/Parser.php
@@ -37,7 +37,7 @@
  *     },
  *     skip: list<non-empty-string>,
  *     grammar: array<array-key, RuleInterface>,
- *     reducers: array<array-key, callable(Context, mixed): mixed>,
+ *     reducers: array<int<0, max>|non-empty-string, callable(Context, mixed): mixed>,
  *     transitions?: array<array-key, mixed>
  * }
  */

diff --git a/src/Traverser.php b/src/Traverser.php
@@ -112,7 +112,7 @@ private function applyToNode(Node $node): void
     }
 
     /**
-     * @param iterable<array-key, mixed> $nodes
+     * @param iterable<mixed, mixed> $nodes
      */
     private function applyToIterable(iterable $nodes): void
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,7 +112,7 @@ private function applyToNode(Node $node): void @@
         }
         /**
-         * @param iterable<array-key, mixed> $nodes
+         * @param iterable<mixed, mixed> $nodes
          */
         private function applyToIterable(iterable $nodes): void
         {
@@ Expand Down @@