[TypeDeclaration] Skip set type by @param doc at TypedPropertyFromAss…

…ignsRector (#1822)

Co-authored-by: GitHub Action <action@github.com>

rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/Fixture/skip_set_type_by_param_doc.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector\Fixture;
+
+final class SkipSetTypeByParamDoc
+{
+    private $property;
+
+    /**
+     * @param int $property
+     */
+    public function __construct($property)
+    {
+        $this->property = $property;
+    }
+}

rules/TypeDeclaration/TypeInferer/AssignToPropertyTypeInferer.php

@@ -13,6 +13,7 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
+use Rector\Core\NodeAnalyzer\ExprAnalyzer;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
 use Rector\TypeDeclaration\AlreadyAssignDetector\ConstructorAssignDetector;
@@ -31,6 +32,7 @@ public function __construct(
         private readonly SimpleCallableNodeTraverser $simpleCallableNodeTraverser,
         private readonly TypeFactory $typeFactory,
         private readonly NodeTypeResolver $nodeTypeResolver,
+        private readonly ExprAnalyzer $exprAnalyzer
     ) {
     }
 
@@ -51,6 +53,10 @@ public function inferPropertyInClassLike(string $propertyName, ClassLike $classL
                 return null;
             }
 
+            if ($this->exprAnalyzer->isNonTypedFromParam($node->expr)) {
+                return null;
+            }
+
             $assignedExprTypes[] = $this->resolveExprStaticTypeIncludingDimFetch($node);
 
             return null;

src/NodeAnalyzer/ExprAnalyzer.php

@@ -12,14 +12,19 @@
 use PhpParser\Node\Scalar;
 use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Scalar\String_;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\PhpParser\Comparing\NodeComparator;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
+use Rector\NodeNameResolver\NodeNameResolver;
 
 final class ExprAnalyzer
 {
     public function __construct(
         private readonly NodeComparator $nodeComparator,
         private readonly BetterNodeFinder $betterNodeFinder,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory,
+        private readonly NodeNameResolver $nodeNameResolver
     ) {
     }
 
@@ -34,13 +39,23 @@ public function isNonTypedFromParam(Expr $expr): bool
             return false;
         }
 
+        $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($functionLike);
+
         $params = $functionLike->getParams();
         foreach ($params as $param) {
             if (! $this->nodeComparator->areNodesEqual($param->var, $expr)) {
                 continue;
             }
 
-            return $param->type === null;
+            $paramName = $this->nodeNameResolver->getName($param->var);
+
+            if ($paramName === null) {
+                continue;
+            }
+
+            $paramTag = $phpDocInfo->getParamTagValueByName($paramName);
+
+            return $paramTag instanceof ParamTagValueNode && $param->type === null;
         }
 
         return false;