danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Flesh out callable arg types

Browse Source
This commit is contained in:
bugreportuser 2019-03-07 17:02:31 -06:00 committed by Matthew Brown
parent d120e582ac
commit 57a4522ee7
2 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php
View File

@ -1089,6 +1089,29 @@ class ExpressionAnalyzer
}
}
if ($return_type instanceof Type\Atomic\TCallable) {
if ($return_type->params) {
foreach ($return_type->params as $param) {
if ($param->type) {
$param->type = self::fleshOutType(
$codebase,
$param->type,
$self_class,
$static_class_type
);
}
}
}
if ($return_type->return_type) {
$return_type->return_type = self::fleshOutType(
$codebase,
$return_type->return_type,
$self_class,
$static_class_type
);
}
}
return $return_type;
}

47
tests/CallableTest.php
View File

@ -693,7 +693,9 @@ class CallableTest extends TestCase
],
'callableSelfArg' => [
'<?php
class Clazz {
class A {}
class B extends A {
/**
* @param callable(static) $f
*/
@ -714,7 +716,48 @@ class CallableTest extends TestCase
function func3(callable $f): void {
$f($this);
}
}',
}
class C extends B {}
$b = new B();
$c = new C();
$b->func1(function(B $x): void {});
$c->func1(function(C $x): void {});
$b->func2(function(B $x): void {});
$c->func2(function(B $x): void {});',
],
'callableSelfReturn' => [
'<?php
class A {}
class B extends A {
/**
* @param callable():static $f
*/
function func1(callable $f): void {}
/**
* @param callable():self $f
*/
function func2(callable $f): void {}
/**
* @param callable():parent $f
*/
function func3(callable $f): void {}
}
class C extends B {}
$b = new B();
$c = new C();
$b->func1(function(): B { return new B(); });
$c->func1(function(): C { return new C(); });
$b->func2(function(): B { return new B(); });
$c->func2(function(): B { return new B(); });',
],
'selfArrayMapCallableWrongClass' => [
'<?php