fix: Make work for 4.x

vimeo · Jan 21, 2022 · f24a0c2 · f24a0c2
1 parent 93d3196
commit f24a0c2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/TypeHintResolver.php b/src/Psalm/Internal/PhpVisitor/Reflector/TypeHintResolver.php
@@ -73,7 +73,8 @@ public static function resolve(
                     $file_storage,
                     $classlike_storage,
                     $aliases,
-                    $analysis_php_version_id
+                    $php_major_version,
+                    $php_minor_version
                 );
 
                 $type = Type::intersectUnionTypes($resolved_type, $type, $codebase);

diff --git a/tests/NativeIntersectionsTest.php b/tests/NativeIntersectionsTest.php
@@ -11,13 +11,13 @@ class NativeIntersectionsTest extends TestCase
     use ValidCodeAnalysisTestTrait;
 
     /**
-     * @return iterable<string,array{code:string,assertions?:array<string,string>,ignored_issues?:list<string>}>
+     * @return iterable<string,array{string,assertions?:array<string,string>,error_levels?:string[],php_version?:string}>
      */
     public function providerValidCodeParse(): iterable
     {
         return [
             'nativeTypeIntersectionInConstructor' => [
-                'code' => '<?php
+                '<?php
                     interface A {
                     }
                     interface B {
@@ -31,11 +31,11 @@ public function self(): A&B
                         }
                     }',
                 'assertions' => [],
-                'ignored_issues' => [],
+                'error_levels' => [],
                 'php_version' => '8.1'
             ],
             'nativeTypeIntersectionAsArgument' => [
-                'code' => '<?php
+                '<?php
                     interface A {
                         function foo(): void;
                     }
@@ -51,20 +51,20 @@ function test(A&B $in): void {
                     test(new C());
                 ',
                 'assertions' => [],
-                'ignored_issues' => [],
+                'error_levels' => [],
                 'php_version' => '8.1'
             ],
         ];
     }
 
     /**
-     * @return iterable<string,array{code:string,error_message:string,ignored_issues?:list<string>,php_version?:string}>
+     * @return iterable<string,array{string,error_message:string,1?:string[],2?:bool,3?:string}>
      */
     public function providerInvalidCodeParse(): iterable
     {
         return [
             'invalidNativeIntersectionArgument' => [
-                'code' => '<?php
+                '<?php
                     interface A {
                         function foo(): void;
                     }
@@ -80,11 +80,12 @@ function test(A&B $in): void {
                     test(new C());
                 ',
                 'error_message' => 'InvalidArgument',
-                'ignored_issues' => [],
-                'php_version' => '8.1'
+                [],
+                false,
+                '8.1'
             ],
             'mismatchDocblockNativeIntersectionArgument' => [
-                'code' => '<?php
+                '<?php
                     interface A {
                         function foo(): void;
                     }
@@ -100,8 +101,9 @@ function test(A&B $in): void {
                     }
                 ',
                 'error_message' => 'MismatchingDocblockParamType',
-                'ignored_issues' => [],
-                'php_version' => '8.1'
+                [],
+                false,
+                '8.1'
             ],
         ];
     }