Merge pull request #88 from weirdan/fix-psalm-compatibility

Fix psalm compatibility
psalm · Sep 18, 2020 · a5e0ba6 · a5e0ba6
2 parents fca9b22 + 54c50d6
commit a5e0ba6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/Hooks/TestCaseHandler.php b/src/Hooks/TestCaseHandler.php
@@ -572,7 +572,10 @@ private static function queueClassLikeForScanning(
         if (method_exists($codebase, 'queueClassLikeForScanning')) {
             $codebase->queueClassLikeForScanning($fq_class_name);
         } else {
-            /** @psalm-suppress InvalidScalarArgument */
+            /**
+             * @psalm-suppress InvalidScalarArgument
+             * @psalm-suppress InvalidArgument
+             */
             $codebase->scanner->queueClassLikeForScanning($fq_class_name, $file_path);
         }
     }

diff --git a/tests/acceptance/Prophecy.feature b/tests/acceptance/Prophecy.feature
@@ -89,8 +89,8 @@ Feature: Prophecy
       """
     When I run Psalm
     Then I see these errors
-      | Type                  | Message                                                                                                 |
-      | InvalidScalarArgument | Argument 1 of Prophecy\Argument::that expects callable(mixed...):bool, Closure():string(hello) provided |
+      | Type                  | Message                                                                                                                  |
+      | InvalidScalarArgument | /Argument 1 of Prophecy\\Argument::that expects callable\(mixed...\):bool, (pure-)?Closure\(\):string\(hello\) provided/ |
     And I see no other errors
 
   Scenario: prophesize() provided by ProphecyTrait is generic

diff --git a/tests/acceptance/TestCase.feature b/tests/acceptance/TestCase.feature
@@ -142,8 +142,8 @@ Feature: TestCase
       """
     When I run Psalm
     Then I see these errors
-      | Type               | Message                                                                  |
-      | MissingConstructor | NS\MyTestCase has an uninitialized variable $this->i, but no constructor |
+      | Type               | Message                                                                                  |
+      | MissingConstructor | /NS\\MyTestCase has an uninitialized (variable\|property) \$this->i, but no constructor/ |
     And I see no other errors
 
   Scenario: Missing data provider is reported