Merge pull request #7684 from AndrolGenhald/bugfix/minor-reference-fixes

Fix some minor issues with references.
vimeo · Feb 20, 2022 · b8cda9e · b8cda9e
2 parents d7d846e + 8f710cc
commit b8cda9e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php
@@ -925,7 +925,7 @@ public static function analyzeAssignmentRef(
                     )
                 );
             }
-            if (!empty($var_comments)) {
+            if (!empty($var_comments) && $var_comments[0]->type !== null && $var_comments[0]->var_id === null) {
                 IssueBuffer::maybeAdd(
                     new InvalidDocblock(
                         "Docblock type cannot be used for reference assignment",
@@ -990,7 +990,8 @@ public static function analyzeAssignmentRef(
 
         $context->vars_in_scope[$lhs_var_id]->parent_nodes[$lhs_node->id] = $lhs_node;
 
-        if (($stmt->var instanceof ArrayDimFetch || $stmt->var instanceof PropertyFetch)
+        if ($statements_analyzer->data_flow_graph !== null
+            && ($stmt->var instanceof ArrayDimFetch || $stmt->var instanceof PropertyFetch)
             && $stmt->var->var instanceof Variable
             && is_string($stmt->var->var->name)
         ) {
@@ -1006,6 +1007,15 @@ public static function analyzeAssignmentRef(
                         : "property-assignment-as-reference"
                 );
             }
+
+            if ($root_var_id === '$this') {
+                // Variables on `$this` are always used
+                $statements_analyzer->data_flow_graph->addPath(
+                    $lhs_node,
+                    new DataFlowNode('variable-use', 'variable use', null),
+                    'variable-use',
+                );
+            }
         }
 
         if ($stmt->var instanceof ArrayDimFetch) {

diff --git a/tests/ReferenceTest.php b/tests/ReferenceTest.php
@@ -247,6 +247,16 @@ function func(array &$a): void
                 ',
                 'assertions' => [],
             ],
+            'allowDocblockTypingOtherVariable' => [
+                'code' => '<?php
+                    $a = 1;
+                    /** @var string $a */
+                    $b = &$a;
+                ',
+                'assertions' => [
+                    '$b' => 'string',
+                ],
+            ],
         ];
     }
 

diff --git a/tests/UnusedVariableTest.php b/tests/UnusedVariableTest.php
@@ -2587,6 +2587,20 @@ function takesAnInt(): void {
                         }
                     }',
             ],
+            'referenceInPropertyIsNotUnused' => [
+                'code' => '<?php
+                    class Foo
+                    {
+                        /** @var int|null */
+                        public $bar = null;
+
+                        public function setBarRef(int $ref): void
+                        {
+                            $this->bar = &$ref;
+                        }
+                    }
+                ',
+            ],
         ];
     }