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

Allow edge-case of by-reference assignment with unitiliazed property

Browse Source 
Fixes #3003
This commit is contained in:
Matthew Brown 2020-03-21 19:23:24 -04:00
parent a7affbe716
commit c986cdf12e
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -788,6 +788,9 @@ class CallAnalyzer
true
))
) {
$was_inside_assignment = $context->inside_assignment;
$context->inside_assignment = true;
// if the variable is in scope, get or we're in a special array function,
// figure out its type before proceeding
if (ExpressionAnalyzer::analyze(
@ -797,6 +800,8 @@ class CallAnalyzer
) === false) {
return false;
}
$context->inside_assignment = $was_inside_assignment;
}
// special handling for array sort

7
src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/PropertyFetchAnalyzer.php
View File

@ -148,7 +148,12 @@ class PropertyFetchAnalyzer
&& $source->getMethodName() === '__construct'
&& !$context->inside_unset
) {
if ($context->inside_isset) {
if ($context->inside_isset
|| ($context->inside_assignment
&& isset($context->vars_in_scope[$var_id])
&& $context->vars_in_scope[$var_id]->isNullable()
)
) {
$stmt_type->initialized = true;
} else {
if (IssueBuffer::accepts(

18
tests/PropertyTypeTest.php
View File

@ -1910,6 +1910,24 @@ class PropertyTypeTest extends TestCase
}
}'
],
'allowByReferenceAssignmentToUninitializedNullableProperty' => [
'<?php
class C {
private ?\Closure $onCancel;
public function __construct() {
$this->foo($this->onCancel);
}
/**
* @param mixed $onCancel
* @param-out \Closure $onCancel
*/
public function foo(&$onCancel) : void {
$onCancel = function (): void {};
}
}'
],
];
}