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 potential crash when calling magic setter

Browse Source
This commit is contained in:
Matt Brown 2021-03-22 23:08:38 -04:00
parent de5a031088
commit bf578d1024
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Psalm/Internal/Analyzer/Statements/Expression/Call/Method/ExistingAtomicMethodCallAnalyzer.php
View File

@ -423,7 +423,7 @@ class ExistingAtomicMethodCallAnalyzer extends CallAnalyzer
$codebase = $statements_analyzer->getCodebase();
$first_arg_value = $stmt->args[0]->value;
$first_arg_value = $stmt->args[0]->value ?? null;
if (!$first_arg_value instanceof PhpParser\Node\Scalar\String_) {
return null;
}
@ -461,7 +461,9 @@ class ExistingAtomicMethodCallAnalyzer extends CallAnalyzer
// If a `@property` annotation is set, the type of the value passed to the
// magic setter must match the annotation.
$second_arg_type = $statements_analyzer->node_data->getType($stmt->args[1]->value);
$second_arg_type = isset($stmt->args[1])
? $statements_analyzer->node_data->getType($stmt->args[1]->value)
: null;
if (isset($class_storage->pseudo_property_set_types['$' . $prop_name]) && $second_arg_type) {
$pseudo_set_type = \Psalm\Internal\Type\TypeExpander::expandUnion(

18
tests/PropertyTypeTest.php
View File

@ -3646,6 +3646,24 @@ class PropertyTypeTest extends TestCase
}',
'error_message' => 'PossiblyNullPropertyFetch',
],
'noCrashWhenCallingMagicSet' => [
'<?php
class A {
public function __set(string $s, mixed $value) : void {}
}
(new A)->__set("foo");',
'error_message' => 'TooFewArguments',
],
'noCrashWhenCallingMagicGet' => [
'<?php
class A {
public function __get(string $s) : mixed {}
}
(new A)->__get();',
'error_message' => 'TooFewArguments',
],
];
}
}