update stan

Author: LordSimal

.phive/phars.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="1.10.56" installed="1.10.56" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.20.0" installed="5.20.0" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="2.1.17" installed="2.1.17" location="./tools/phpstan" copy="false"/>
 </phive>

composer.json

@@ -61,14 +61,9 @@
         ],
         "cs-check": "phpcs --colors -p src/ tests/",
         "cs-fix": "phpcbf --colors -p src/ tests/",
-        "stan": [
-            "@phpstan",
-            "@psalm"
-        ],
+        "stan": "@phpstan",
         "phpstan": "tools/phpstan analyse",
-        "psalm": "tools/psalm --show-info=false",
         "stan-baseline": "tools/phpstan --generate-baseline",
-        "psalm-baseline": "tools/psalm  --set-baseline=psalm-baseline.xml",
         "stan-setup": "phive install",
         "test": "phpunit",
         "test-coverage": "phpunit --coverage-clover=clover.xml"

phpstan-baseline.neon

@@ -0,0 +1,7 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Parameter \#1 \$callback of static method Closure\:\:fromCallable\(\) expects callable\(\)\: mixed, array\{mixed, string\} given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Job/Message.php

phpstan.neon

@@ -1,12 +1,14 @@
+includes:
+	- phpstan-baseline.neon
+
 parameters:
 	level: 8
-	checkMissingIterableValueType: false
-	checkGenericClassInNonGenericObjectType: false
 	treatPhpDocTypesAsCertain: false
 	bootstrapFiles:
 		- tests/bootstrap.php
 	paths:
 		- src/
 	ignoreErrors:
-		- '#Parameter \#1 \$callback of static method Closure::fromCallable\(\) expects callable\(\): mixed, array\{mixed, string\} given.#'
-		- '#Method Cake\\Queue\\Job\\Message::getTarget\(\) should return array\{class-string, string\} but returns non-empty-array.#'
+		- identifier: missingType.iterableValue
+		- identifier: missingType.generics
+		- identifier: trait.unused

psalm-baseline.xml

@@ -39,7 +39,6 @@ public function onResult(MessageResult $context): void
 
         [$class, $method] = $jobMessage->getTarget();
 
-        /** @psalm-suppress InvalidPropertyFetch */
         if (empty($class::$shouldBeUnique)) {
             return;
         }

psalm.xml

@@ -104,11 +104,11 @@ public function getCallable(): Closure
      * Get the target class and method.
      *
      * @return array{string, string}
-     * @psalm-return array{class-string, string}
+     * @phpstan-return array{class-string, string}
      */
     public function getTarget(): array
     {
-        /** @var array|null $target */
+        /** @var array{class-string, string}|null $target */
         $target = $this->parsedBody['class'] ?? null;
 
         if (!is_array($target) || count($target) !== 2) {
@@ -153,7 +153,6 @@ public function getMaxAttempts(): ?int
 
         $class = $target[0];
 
-        /** @psalm-suppress InvalidPropertyFetch */
         return $class::$maxAttempts ?? null;
     }
 

src/Consumption/RemoveUniqueJobIdFromCacheExtension.php

@@ -228,7 +228,6 @@ public static function push(string|array $className, array $data = [], array $op
 
         $logger = $config['logger'] ? Log::engine($config['logger']) : null;
 
-        /** @psalm-suppress InvalidPropertyFetch */
         if (!empty($class::$shouldBeUnique)) {
             if (empty($config['uniqueCache'])) {
                 throw new InvalidArgumentException(
@@ -277,7 +276,6 @@ public static function push(string|array $className, array $data = [], array $op
         $client = static::engine($name);
         $client->sendEvent($queue, $message);
 
-        /** @psalm-suppress InvalidPropertyFetch */
         if (!empty($class::$shouldBeUnique)) {
             $uniqueId = static::getUniqueId($class, $method, $data);