diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/TypeHintResolver.php b/src/Psalm/Internal/PhpVisitor/Reflector/TypeHintResolver.php index c83f172656a..e4cfb5907d6 100644 --- 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 index 443cf2ba329..d5ca55b4e16 100644 --- a/tests/NativeIntersectionsTest.php +++ b/tests/NativeIntersectionsTest.php @@ -11,13 +11,13 @@ class NativeIntersectionsTest extends TestCase use ValidCodeAnalysisTestTrait; /** - * @return iterable,ignored_issues?:list}> + * @return iterable,error_levels?:string[],php_version?:string}> */ public function providerValidCodeParse(): iterable { return [ 'nativeTypeIntersectionInConstructor' => [ - 'code' => ' [], - 'ignored_issues' => [], + 'error_levels' => [], 'php_version' => '8.1' ], 'nativeTypeIntersectionAsArgument' => [ - 'code' => ' [], - 'ignored_issues' => [], + 'error_levels' => [], 'php_version' => '8.1' ], ]; } /** - * @return iterable,php_version?:string}> + * @return iterable */ public function providerInvalidCodeParse(): iterable { return [ 'invalidNativeIntersectionArgument' => [ - 'code' => ' 'InvalidArgument', - 'ignored_issues' => [], - 'php_version' => '8.1' + [], + false, + '8.1' ], 'mismatchDocblockNativeIntersectionArgument' => [ - 'code' => ' 'MismatchingDocblockParamType', - 'ignored_issues' => [], - 'php_version' => '8.1' + [], + false, + '8.1' ], ]; }