Merge pull request #6872 from orklah/InvalidDocblockPromotedProperties

allow signature type for promoted property as well as property docblock
vimeo · Nov 9, 2021 · 830c898 · 830c898
2 parents 0fbf515 + d409c06
commit 830c898
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php
@@ -606,7 +606,7 @@ public function start(PhpParser\Node\FunctionLike $stmt, bool $fake_method = fal
                 }
 
                 //both way to document type were used
-                if ($param_storage->type && $var_comment_type) {
+                if ($param_storage->type && $param_storage->type->from_docblock && $var_comment_type) {
                     if (IssueBuffer::accepts(
                         new InvalidDocblock(
                             'Param ' . $param_storage->name . ' of ' . $cased_function_id .
@@ -625,7 +625,7 @@ public function start(PhpParser\Node\FunctionLike $stmt, bool $fake_method = fal
 
                 $property_storage = $classlike_storage->properties[$param_storage->name] = new PropertyStorage();
                 $property_storage->is_static = false;
-                $property_storage->type = $param_storage->type ?? $var_comment_type;
+                $property_storage->type = $param_storage->type;
                 $property_storage->signature_type = $param_storage->signature_type;
                 $property_storage->signature_type_location = $param_storage->signature_type_location;
                 $property_storage->type_location = $param_storage->type_location;

diff --git a/tests/AnnotationTest.php b/tests/AnnotationTest.php
@@ -1319,6 +1319,19 @@ public function __construct(
                     new UserRole(new stdClass(), new stdClass());
                     '
             ],
+            'promotedPropertiesDocumentationForPropertyAndSignature' => [
+                '<?php
+                    final class A
+                    {
+                        public function __construct(
+                            /**
+                             * @var iterable<string>
+                             */
+                            private iterable $strings,
+                        ) {
+                        }
+                    }'
+            ],
         ];
     }