Merge pull request #488 from derrabus/bump/sa

Psalm 5

.github/workflows/static-analysis.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@2.1.0"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0"

composer.json

@@ -40,10 +40,10 @@
     "require-dev": {
         "doctrine/cache": "^1.11 || ^2.0",
         "doctrine/coding-standard": "^9 || ^12",
-        "phpstan/phpstan": "~1.4.10 || ^1.8.0",
+        "phpstan/phpstan": "~1.4.10 || ^1.10.28",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
         "symfony/cache": "^4.4 || ^5.4 || ^6",
-        "vimeo/psalm": "^4.10"
+        "vimeo/psalm": "^4.30 || ^5.14"
     },
     "suggest": {
         "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"

lib/Doctrine/Common/Annotations/DocParser.php

@@ -49,6 +49,8 @@
  * A parser for docblock annotations.
  *
  * It is strongly discouraged to change the default annotation parsing process.
+ *
+ * @psalm-type Arguments = array{positional_arguments?: array<int, mixed>, named_arguments?: array<string, mixed>}
  */
 final class DocParser
 {
@@ -1038,7 +1040,7 @@ private function Annotation()
     /**
      * MethodCall ::= ["(" [Values] ")"]
      *
-     * @return mixed[]
+     * @psalm-return Arguments
      *
      * @throws AnnotationException
      * @throws ReflectionException
@@ -1065,7 +1067,7 @@ private function MethodCall(): array
     /**
      * Values ::= Array | Value {"," Value}* [","]
      *
-     * @return mixed[]
+     * @psalm-return Arguments
      *
      * @throws AnnotationException
      * @throws ReflectionException
@@ -1427,7 +1429,7 @@ private function isIgnoredAnnotation(string $name): bool
     /**
      * Resolve positional arguments (without name) to named ones
      *
-     * @param array<string,mixed> $arguments
+     * @psalm-param Arguments $arguments
      *
      * @return array<string,mixed>
      */

phpstan.neon

@@ -1,5 +1,6 @@
 parameters:
     level: 3
+    phpVersion: 80200
     paths:
         - lib
         - tests

psalm.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="7"
+    phpVersion="8.2"
     resolveFromConfigFile="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"