danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 04:45:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9676 from Nicelocal/fix_callable_union_comparison

Browse Source 
Fix comparison of unions of multiple callables
This commit is contained in:
orklah 2023-04-19 13:02:01 +02:00 committed by GitHub
commit 76ebf54262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Internal/Type/Comparator/UnionTypeComparator.php
View File

@ -175,7 +175,7 @@ class UnionTypeComparator
if ($container_required_param_count > $input_all_param_count
|| $container_all_param_count < $input_required_param_count
) {
return false;
continue;
}
}

4
tests/ArgTest.php
View File

@ -805,7 +805,7 @@ class ArgTest extends TestCase
function foo($a) {}
caller("foo");',
'error_message' => 'InvalidScalarArgument',
'error_message' => 'PossiblyInvalidArgument',
],
'callableArgsCountMismatch' => [
'code' => '<?php
@ -823,7 +823,7 @@ class ArgTest extends TestCase
function foo($a, $b) {}
caller("foo");',
'error_message' => 'InvalidScalarArgument',
'error_message' => 'InvalidArgument',
],
];
}

4
tests/TypeComparatorTest.php
View File

@ -159,6 +159,10 @@ class TypeComparatorTest extends TestCase
'lowercase-string',
'callable-string',
],
'callableUnionAcceptsCallableUnion' => [
'(callable(int,string[]): void)|(callable(int): void)',
'(callable(int): void)|(callable(int,string[]): void)',
],
];
}