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

Fix #1251 - allow instanceof comparisons to class strings

Browse Source
This commit is contained in:
Matthew Brown 2019-01-27 14:10:33 -05:00
parent 16c2a0f899
commit be06393b9c
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
View File

@ -47,9 +47,9 @@ class AssertionFinder
$if_types = [];
if ($conditional instanceof PhpParser\Node\Expr\Instanceof_) {
$instanceof_type = self::getInstanceOfTypes($conditional, $this_class_name, $source);
$instanceof_types = self::getInstanceOfTypes($conditional, $this_class_name, $source);
if ($instanceof_type) {
if ($instanceof_types) {
$var_name = ExpressionAnalyzer::getArrayVarId(
$conditional->expr,
$this_class_name,
@ -57,7 +57,7 @@ class AssertionFinder
);
if ($var_name) {
$if_types[$var_name] = [[$instanceof_type]];
$if_types[$var_name] = [$instanceof_types];
}
}
@ -1653,7 +1653,7 @@ class AssertionFinder
* @param string|null $this_class_name
* @param FileSource $source
*
* @return string|null
* @return array<int, string>
*/
protected static function getInstanceOfTypes(
PhpParser\Node\Expr\Instanceof_ $stmt,
@ -1667,15 +1667,25 @@ class AssertionFinder
$source->getAliases()
);
return $instanceof_class;
return [$instanceof_class];
} elseif ($this_class_name
&& (in_array(strtolower($stmt->class->parts[0]), ['self', 'static'], true))
) {
return $this_class_name;
return [$this_class_name];
}
} elseif (isset($stmt->class->inferredType)) {
$literal_class_strings = [];
foreach ($stmt->class->inferredType->getTypes() as $atomic_type) {
if ($atomic_type instanceof Type\Atomic\TLiteralClassString) {
$literal_class_strings[] = $atomic_type->value;
}
}
return null;
return $literal_class_strings;
}
return [];
}
/**

11
tests/ClassStringTest.php
View File

@ -474,6 +474,17 @@ class ClassStringTest extends TestCase
}
}'
],
'instanceofClassString' => [
'<?php
function f(Exception $e): ?InvalidArgumentException {
$type = InvalidArgumentException::class;
if ($e instanceof $type) {
return $e;
} else {
return null;
}
}'
],
];
}