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

Fix #1339 - no crash when using self/static/parent in closure

Browse Source
This commit is contained in:
Matthew Brown 2019-02-17 13:14:59 -05:00
parent 8edb117451
commit 40a91eab6e
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
View File

@ -1386,8 +1386,8 @@ class CallAnalyzer
$fleshed_out_type = ExpressionAnalyzer::fleshOutType(
$codebase,
$param_type,
$fq_class_name,
$fq_class_name
$fq_class_name ?: $context->self,
$fq_class_name ?: $context->self
);
if ($arg->unpack) {

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

@ -976,6 +976,15 @@ class ExpressionAnalyzer
);
}
$return_type->value = $self_class;
} elseif ($return_type_lc === 'parent') {
if (!$self_class) {
throw new \UnexpectedValueException(
'Cannot handle ' . $return_type->value . ' when $self_class is empty'
);
}
var_dump('here');
$return_type->value = $self_class;
} else {
$return_type->value = $codebase->classlikes->getUnAliasedName($return_type->value);

25
tests/CallableTest.php
View File

@ -677,6 +677,31 @@ class CallableTest extends TestCase
/** @psalm-suppress UndefinedClass */
array_map(["two", "three"], ["one", "two"]);',
],
'callableSelfArg' => [
'<?php
class Clazz {
/**
* @param callable(static) $f
*/
function func1(callable $f): void {
$f($this);
}
/**
* @param callable(self) $f
*/
function func2(callable $f): void {
$f($this);
}
/**
* @param callable(parent) $f
*/
function func3(callable $f): void {
$f($this);
}
}',
],
];
}