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

Fixes #3003
vimeo · Mar 21, 2020 · c986cdf · c986cdf
1 parent a7affbe
commit c986cdf
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
@@ -788,6 +788,9 @@ private static function handleByRefFunctionArg(
                     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 @@ private static function handleByRefFunctionArg(
             ) === false) {
                 return false;
             }
+
+            $context->inside_assignment = $was_inside_assignment;
         }
 
         // special handling for array sort

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/PropertyFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/PropertyFetchAnalyzer.php
@@ -148,7 +148,12 @@ public static function analyzeInstance(
                     && $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(

diff --git a/tests/PropertyTypeTest.php b/tests/PropertyTypeTest.php
@@ -1910,6 +1910,24 @@ public function __construct() {
                         }
                     }'
             ],
+            '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 {};
+                        }
+                    }'
+            ],
         ];
     }