Fix #4386 - fix issues with property promotion

vimeo · Oct 21, 2020 · ad5a8c2 · ad5a8c2
1 parent fd43ba7
commit ad5a8c2
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Codebase/ClassLikes.php b/src/Psalm/Internal/Codebase/ClassLikes.php
@@ -1700,6 +1700,7 @@ private function checkMethodReferences(ClassLikeStorage $classlike_storage, Meth
                             $offset
                         )
                             && $param_storage->location
+                            && !$param_storage->promoted_property
                         ) {
                             if ($method_storage->final) {
                                 if (IssueBuffer::accepts(

diff --git a/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php b/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
@@ -2399,6 +2399,19 @@ private function registerFunctionLike(PhpParser\Node\FunctionLike $stmt, bool $f
                     continue;
                 }
 
+                if (isset($class_storage->properties[$param_storage->name]) && $param_storage->location) {
+                    IssueBuffer::add(
+                        new \Psalm\Issue\ParseError(
+                            'Promoted propertty ' . $param_storage->name . ' clashes with an existing property',
+                            $param_storage->location
+                        )
+                    );
+
+                    $storage->has_visitor_issues = true;
+                    $this->file_storage->has_visitor_issues = true;
+                    continue;
+                }
+
                 $property_storage = $class_storage->properties[$param_storage->name] = new PropertyStorage();
                 $property_storage->is_static = false;
                 $property_storage->type = $param_storage->type;
@@ -2408,6 +2421,7 @@ private function registerFunctionLike(PhpParser\Node\FunctionLike $stmt, bool $f
                 $property_storage->location = $param_storage->location;
                 $property_storage->stmt_location = new CodeLocation($this->file_scanner, $param);
                 $property_storage->has_default = $param->default ? true : false;
+                $param_storage->promoted_property = true;
 
                 $property_id = $fq_classlike_name . '::$' . $param_storage->name;
 

diff --git a/src/Psalm/Storage/FunctionLikeParameter.php b/src/Psalm/Storage/FunctionLikeParameter.php
@@ -93,6 +93,11 @@ class FunctionLikeParameter
      */
     public $expect_variable = false;
 
+    /**
+     * @var bool
+     */
+    public $promoted_property = false;
+
     public function __construct(
         string $name,
         bool $by_ref,

diff --git a/tests/UnusedCodeTest.php b/tests/UnusedCodeTest.php
@@ -743,6 +743,16 @@ public function bar(array $map) : void {
 
                     (new References)->bar(["a" => "b"]);'
             ],
+            'promotedPropertyIsUsed' => [
+                '<?php
+                    class Test {
+                        public function __construct(public int $id, public string $name) {}
+                    }
+
+                    $test = new Test(1, "ame");
+                    echo $test->id;
+                    echo $test->name;'
+            ],
         ];
     }