Upgrade Psalm up to v5.x

spiral · Apr 10, 2023 · 48ecae0 · 48ecae0
1 parent 084c8ca
commit 48ecae0
Show file tree

Hide file tree

Showing 145 changed files with 293 additions and 108 deletions.
diff --git a/composer.json b/composer.json
@@ -139,7 +139,7 @@
         "spiral/testing": "^2.2",
         "spiral/validator": "^1.2",
         "symplify/monorepo-builder": "^10.2.7",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload-dev": {
         "psr-4": {

diff --git a/monorepo-builder.php b/monorepo-builder.php
@@ -102,7 +102,7 @@
             'mockery/mockery'           => '^1.5',
             'spiral/code-style'         => '^1.1',
             'symplify/monorepo-builder' => '^10.2.7',
-            'vimeo/psalm'               => '^4.27',
+            'vimeo/psalm'               => '^5.9',
         ],
     ]);
 

diff --git a/psalm.xml b/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src/*/src" />

diff --git a/src/AnnotatedRoutes/composer.json b/src/AnnotatedRoutes/composer.json
@@ -41,7 +41,7 @@
         "phpunit/phpunit": "^9.5.20",
         "spiral/framework": "^3.1",
         "spiral/nyholm-bridge": "^1.2",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload-dev": {
         "psr-4": {

diff --git a/src/AnnotatedRoutes/psalm.xml b/src/AnnotatedRoutes/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/Auth/composer.json b/src/Auth/composer.json
@@ -32,7 +32,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.20",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Auth/psalm.xml b/src/Auth/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/AuthHttp/composer.json b/src/AuthHttp/composer.json
@@ -39,7 +39,7 @@
         "spiral/http": "^3.7",
         "spiral/debug": "^3.7",
         "nyholm/psr7": "^1.5",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/AuthHttp/psalm.xml b/src/AuthHttp/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/AuthHttp/src/Transport/CookieTransport.php b/src/AuthHttp/src/Transport/CookieTransport.php
@@ -79,6 +79,9 @@ public function removeToken(Request $request, Response $response, string $tokenI
         return $this->commitToken($request, $response, null, null);
     }
 
+    /**
+     * @return int<0, max>|null
+     */
     private function getLifetime(\DateTimeInterface $expiresAt = null): ?int
     {
         if ($expiresAt === null) {

diff --git a/src/Boot/composer.json b/src/Boot/composer.json
@@ -39,7 +39,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5.20",
         "mockery/mockery": "^1.5",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload": {
         "files": [

diff --git a/src/Boot/psalm.xml b/src/Boot/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/Boot/src/BootloadManager/Initializer.php b/src/Boot/src/BootloadManager/Initializer.php
@@ -144,7 +144,6 @@ protected function shouldBeBooted(\ReflectionNamedType $type): bool
         /** @var TClass $class */
         $class = $type->getName();
 
-        /** @psalm-suppress InvalidArgument */
         return $this->isBootloader($class)
             && !$this->bootloaders->isBooted($class);
     }

diff --git a/src/Boot/src/Injector/EnumInjector.php b/src/Boot/src/Injector/EnumInjector.php
@@ -39,6 +39,7 @@ public function createInjection(\ReflectionClass $class, string $context = null)
         }
 
         $this->validateClass($class, $attribute);
+        /** @var ?\Closure $closure */
         $closure = $class->getMethod($attribute->method)->getClosure();
         \assert($closure !== null);
 

diff --git a/src/Bridge/Dotenv/composer.json b/src/Bridge/Dotenv/composer.json
@@ -34,7 +34,7 @@
         "mockery/mockery": "^1.5",
         "phpunit/phpunit": "^9.5.20",
         "spiral/boot": "^3.7",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Bridge/Dotenv/psalm.xml b/src/Bridge/Dotenv/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/Bridge/Monolog/composer.json b/src/Bridge/Monolog/composer.json
@@ -34,7 +34,7 @@
         "spiral/boot": "^3.7",
         "phpunit/phpunit": "^9.5.20",
         "mockery/mockery": "^1.5",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Bridge/Monolog/psalm.xml b/src/Bridge/Monolog/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/Bridge/Stempler/composer.json b/src/Bridge/Stempler/composer.json
@@ -39,7 +39,7 @@
         "spiral/boot": "^3.7",
         "phpunit/phpunit": "^9.5.20",
         "mockery/mockery": "^1.5",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Bridge/Stempler/psalm.xml b/src/Bridge/Stempler/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/Bridge/Stempler/src/StemplerEngine.php b/src/Bridge/Stempler/src/StemplerEngine.php
@@ -201,7 +201,6 @@ public function render(array $data=[]): string {
      */
     private function className(ViewSource $source, ContextInterface $context): string
     {
-        /** @psalm-suppress LessSpecificReturnStatement */
         return $this->classPrefix . $this->cacheKey($source, $context);
     }
 

diff --git a/src/Broadcasting/composer.json b/src/Broadcasting/composer.json
@@ -45,7 +45,7 @@
         "mockery/mockery": "^1.5",
         "phpunit/phpunit": "^9.5.20",
         "spiral/boot": "^3.7",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload-dev": {
         "psr-4": {

diff --git a/src/Broadcasting/psalm.xml b/src/Broadcasting/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/Broadcasting/src/BroadcastInterface.php b/src/Broadcasting/src/BroadcastInterface.php
@@ -7,8 +7,8 @@
 use Spiral\Broadcasting\Exception\BroadcastException;
 
 /**
- * @psalm-type TopicsList = non-empty-list<string> | non-empty-list<\Stringable> | string | Stringable
- * @psalm-type MessagesList = non-empty-list<string> | non-empty-list<\Stringable> | string | Stringable
+ * @psalm-type TopicsList = non-empty-list<string> | non-empty-list<\Stringable> | string | \Stringable
+ * @psalm-type MessagesList = non-empty-list<string> | non-empty-list<\Stringable> | string | \Stringable
  */
 interface BroadcastInterface
 {

diff --git a/src/Cache/composer.json b/src/Cache/composer.json
@@ -43,7 +43,7 @@
         "spiral/boot": "^3.7",
         "mockery/mockery": "^1.5",
         "phpunit/phpunit": "^9.5.20",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload-dev": {
         "psr-4": {

diff --git a/src/Cache/psalm.xml b/src/Cache/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/Cache/src/Bootloader/CacheBootloader.php b/src/Cache/src/Bootloader/CacheBootloader.php
@@ -43,6 +43,7 @@ public function init(BinderInterface $binder, EnvironmentInterface $env, Directo
     {
         $this->initConfig($env, $dirs);
 
+        /** @psalm-suppress InvalidCast https://github.com/vimeo/psalm/issues/8810 */
         $binder->bindInjector(CacheInterface::class, CacheInjector::class);
     }
 

diff --git a/src/Config/composer.json b/src/Config/composer.json
@@ -34,7 +34,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5.20",
         "mockery/mockery": "^1.5",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Config/psalm.xml b/src/Config/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/Config/src/Patch/Prepend.php b/src/Config/src/Patch/Prepend.php
@@ -26,12 +26,12 @@ public function __construct(
     public function patch(array $config): array
     {
         try {
-            $target = &$this->dotGet($config, $this->position);
+            $_target = &$this->dotGet($config, $this->position);
 
             if ($this->key !== null) {
-                $target = \array_merge([$this->key => $this->value], $target);
+                $_target = \array_merge([$this->key => $this->value], $_target);
             } else {
-                \array_unshift($target, $this->value);
+                \array_unshift($_target, $this->value);
             }
         } catch (DotNotFoundException $e) {
             throw new PatchException($e->getMessage(), $e->getCode(), $e);

diff --git a/src/Config/src/Patch/Set.php b/src/Config/src/Patch/Set.php
@@ -25,8 +25,8 @@ public function __construct(
     public function patch(array $config): array
     {
         try {
-            $target = &$this->dotGet($config, $this->key);
-            $target = $this->value;
+            $_target = &$this->dotGet($config, $this->key);
+            $_target = $this->value;
         } catch (DotNotFoundException $e) {
             throw new PatchException($e->getMessage(), $e->getCode(), $e);
         }

diff --git a/src/Console/composer.json b/src/Console/composer.json
@@ -38,7 +38,7 @@
         "spiral/boot": "^3.7",
         "phpunit/phpunit": "^9.5.20",
         "mockery/mockery": "^1.5",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Console/psalm.xml b/src/Console/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/Console/src/Traits/HelpersTrait.php b/src/Console/src/Traits/HelpersTrait.php
@@ -19,7 +19,7 @@ trait HelpersTrait
     /**
      * OutputInterface is the interface implemented by all Output classes. Only exists when command
      * are being executed.
-     * @var OutputInterface|SymfonyStyle|null
+     * @var SymfonyStyle|null
      */
     protected ?OutputInterface $output = null;
 

diff --git a/src/Cookies/composer.json b/src/Cookies/composer.json
@@ -37,7 +37,7 @@
         "mockery/mockery": "^1.5",
         "spiral/http": "^3.7",
         "nyholm/psr7": "^1.5",
-        "vimeo/psalm": "^4.27"
+        "vimeo/psalm": "^5.9"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Cookies/psalm.xml b/src/Cookies/psalm.xml
@@ -11,6 +11,8 @@
     findUnusedVariablesAndParams="true"
     ensureArrayStringOffsetsExist="true"
     addParamDefaultToDocblockType="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/Core/composer.json b/src/Core/composer.json
@@ -33,7 +33,7 @@
     "require-dev": {
         "mockery/mockery": "^1.5",
         "phpunit/phpunit": "^9.5.20",
-        "vimeo/psalm": "^5.6"
+        "vimeo/psalm": "^5.9"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Core/src/Container.php b/src/Core/src/Container.php
@@ -32,7 +32,6 @@
  *
  * @psalm-import-type TResolver from BinderInterface
  * @psalm-import-type TInvokable from InvokerInterface
- * @psalm-suppress PropertyNotSetInConstructor
  */
 final class Container implements
     ContainerInterface,
@@ -64,7 +63,6 @@ public function __construct(
         $this->initServices($this, $scopeName);
 
         // Bind himself
-        /** @psalm-suppress PossiblyNullPropertyAssignment */
         $this->state->bindings = \array_merge($this->state->bindings, [
             self::class               => \WeakReference::create($this),
             ContainerInterface::class => self::class,
@@ -107,6 +105,7 @@ public function validateArguments(ContextFunction $reflection, array $arguments
      */
     public function make(string $alias, array $parameters = [], string $context = null): mixed
     {
+        /** @psalm-suppress TooManyArguments */
         return $this->factory->make($alias, $parameters, $context);
     }
 
@@ -132,6 +131,7 @@ public function make(string $alias, array $parameters = [], string $context = nu
      */
     public function get(string|Autowire $id, string $context = null): mixed
     {
+        /** @psalm-suppress TooManyArguments */
         return $this->container->get($id, $context);
     }
 

diff --git a/src/Core/src/Internal/Container.php b/src/Core/src/Internal/Container.php
@@ -53,6 +53,7 @@ public function get(string|Autowire $id, string $context = null): mixed
             return $id->resolve($this->factory);
         }
 
+        /** @psalm-suppress TooManyArguments */
         return $this->factory->make($id, [], $context);
     }