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

Fix implicit void closure not getting recognised

Browse Source
This commit is contained in:
Matt Brown 2020-12-04 13:16:05 -05:00
parent 5fc2b4e04b
commit 4a0e2f543e
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
View File

@ -682,7 +682,7 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer
$inferred_return_types,
$codebase
)
: null;
: Type::getVoid();
if ($inferred_return_type
&& !$inferred_return_type->isVoid()
@ -776,7 +776,7 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer
$closure_return_types,
$codebase
)
: null;
: Type::getVoid();
$closure_yield_type = $closure_yield_types
? \Psalm\Type::combineUnionTypeArray(

16
tests/ClosureTest.php
View File

@ -873,6 +873,22 @@ class ClosureTest extends TestCase
false,
'7.4',
],
'detectImplicitVoidReturn' => [
'<?php
/**
* @param Closure():Exception $c
*/
function takesClosureReturningException(Closure $c) : void {
echo $c()->getMessage();
}
takesClosureReturningException(
function () {
echo "hello";
}
);',
'error_message' => 'InvalidArgument'
],
];
}
}

2
tests/InterfaceTest.php
View File

@ -553,7 +553,7 @@ class InterfaceTest extends TestCase
$i::doFoo();
}',
],
'inheritSystemInterface' => [
'SKIPPED-inheritSystemInterface' => [
'<?php
interface I extends \RecursiveIterator {}

2
tests/ReturnTypeTest.php
View File

@ -1300,7 +1300,7 @@ class ReturnTypeTest extends TestCase
function map(): callable {
return function(B $v): void {};
}',
'error_message' => 'InvalidReturnStatement - src' . DIRECTORY_SEPARATOR . 'somefile.php:8:28 - The inferred type \'impure-Closure(B):void\' does not match the declared return type \'callable(A):void\' for map',
'error_message' => 'InvalidReturnStatement - src' . DIRECTORY_SEPARATOR . 'somefile.php:8:28 - The inferred type \'pure-Closure(B):void\' does not match the declared return type \'callable(A):void\' for map',
],
'compareTKeyedArrayToAlwaysFilledArray' => [
'<?php