Bump Psalm version from 4.7 to 4.22

Sylius · Apr 15, 2022 · a1382f0 · a1382f0
1 parent 7c8aed1
commit a1382f0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -57,6 +57,10 @@ jobs:
                     (cd src/Bundle/test && bin/console doctrine:database:create)
                     (cd src/Bundle/test && bin/console doctrine:schema:create)
 
+            -
+                name: Run Psalm
+                run: vendor/bin/psalm --php-version=${{ matrix.php }}
+
             -
                 name: Run analysis
                 run: |

diff --git a/composer.json b/composer.json
@@ -73,7 +73,7 @@
         "symfony/workflow": "^4.4 || ^5.4 || ^6.0",
         "symplify/easy-coding-standard": "^9.4",
         "twig/twig": "^2.12 || ^3.0",
-        "vimeo/psalm": "4.7.0",
+        "vimeo/psalm": "^4.22",
         "rector/rector": "^0.11.47"
     },
     "suggest": {
@@ -102,8 +102,7 @@
         "analyse": [
             "@composer validate --strict",
             "vendor/bin/ecs check src",
-            "vendor/bin/phpstan analyse --ansi -c phpstan.neon -l max src",
-            "vendor/bin/psalm"
+            "vendor/bin/phpstan analyse --ansi -c phpstan.neon -l max src"
         ],
         "fix": [
             "vendor/bin/ecs check src --fix"

diff --git a/psalm.xml b/psalm.xml
@@ -25,6 +25,12 @@
     </projectFiles>
 
     <issueHandlers>
+        <ArgumentTypeCoercion>
+            <errorLevel type="suppress">
+                <referencedFunction name="ReflectionClass::getAttributes" />
+            </errorLevel>
+        </ArgumentTypeCoercion>
+
         <DeprecatedMethod>
             <errorLevel type="suppress">
                 <referencedMethod name="Symfony\Component\EventDispatcher\Event::isPropagationStopped" />
@@ -95,6 +101,7 @@
 
         <PropertyNotSetInConstructor>
             <errorLevel type="suppress">
+                <file name="src/Component/Tests/Reflection/ClassReflectionTest.php" />
                 <file name="src/Bundle/Validator/Constraints/UniqueWithinCollectionConstraint.php" />
                 <file name="src/Bundle/Validator/Constraints/Enabled.php" />
                 <file name="src/Bundle/Validator/Constraints/Disabled.php" />

diff --git a/src/Bundle/DependencyInjection/Compiler/Helper/TargetEntitiesResolver.php b/src/Bundle/DependencyInjection/Compiler/Helper/TargetEntitiesResolver.php
@@ -17,11 +17,11 @@
 
 final class TargetEntitiesResolver implements TargetEntitiesResolverInterface
 {
-    public function resolve(array $resources): array
+    public function resolve(array $resourcesConfiguration): array
     {
         $interfaces = [];
 
-        foreach ($resources as $alias => $configuration) {
+        foreach ($resourcesConfiguration as $alias => $configuration) {
             $model = $this->getModel($alias, $configuration);
 
             $modelInterfaces = class_implements($model) ?: [];
@@ -43,7 +43,7 @@ public function resolve(array $resources): array
             return (string) current($classes);
         }, $interfaces);
 
-        foreach ($resources as $alias => $configuration) {
+        foreach ($resourcesConfiguration as $alias => $configuration) {
             if (isset($configuration['classes']['interface'])) {
                 $model = $this->getModel($alias, $configuration);
                 $interface = $configuration['classes']['interface'];

diff --git a/src/Bundle/Routing/RouteAttributesFactoryInterface.php b/src/Bundle/Routing/RouteAttributesFactoryInterface.php
@@ -17,5 +17,6 @@
 
 interface RouteAttributesFactoryInterface
 {
+    /** @psalm-param class-string $className */
     public function createRouteForClass(RouteCollection $routeCollection, string $className): void;
 }
diff --git a/src/Component/Reflection/ClassReflection.php b/src/Component/Reflection/ClassReflection.php
@@ -56,6 +56,8 @@ public static function getResourcesByPath(string $path): iterable
     }
 
     /**
+     * @psalm-param class-string $className
+     *
      * @return \ReflectionAttribute[]
      */
     public static function getClassAttributes(string $className, string $attributeName): array
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
+         * @psalm-param class-string $className
+         *
          * @return \ReflectionAttribute[]
          */
         public static function getClassAttributes(string $className, string $attributeName): array
@@ Expand Down @@