[BetterPhpDocParser] Call phpdocInfo->markAsChanged() on change param…

…/return type on PhpDocTypeChanger (#3099) * [BetterPhpDocParser] Call phpdocInfo->markasChanged() on change param/return type * verify has changed usage on AddArrayParamDocTypeRector * Fix PHPStan
rectorphp · Nov 26, 2022 · 07b529a · 07b529a
1 parent f37a6eb
commit 07b529a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocTypeChanger.php b/packages/BetterPhpDocParser/PhpDocManipulator/PhpDocTypeChanger.php
@@ -86,6 +86,7 @@ public function changeVarType(PhpDocInfo $phpDocInfo, Type $newType): void
         if ($currentVarTagValueNode !== null) {
             // only change type
             $currentVarTagValueNode->type = $newPHPStanPhpDocType;
+            $phpDocInfo->markAsChanged();
         } else {
             // add completely new one
             $varTagValueNode = new VarTagValueNode($newPHPStanPhpDocType, '', '');
@@ -117,6 +118,7 @@ public function changeReturnType(PhpDocInfo $phpDocInfo, Type $newType): bool
         if ($currentReturnTagValueNode !== null) {
             // only change type
             $currentReturnTagValueNode->type = $newPHPStanPhpDocType;
+            $phpDocInfo->markAsChanged();
         } else {
             // add completely new one
             $returnTagValueNode = new ReturnTagValueNode($newPHPStanPhpDocType, '');
@@ -154,6 +156,7 @@ public function changeParamType(PhpDocInfo $phpDocInfo, Type $newType, Param $pa
             }
 
             $paramTagValueNode->type = $phpDocType;
+            $phpDocInfo->markAsChanged();
         } else {
             $paramTagValueNode = $this->paramPhpDocNodeFactory->create($phpDocType, $param);
             $phpDocInfo->addTagValueNode($paramTagValueNode);

diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php
@@ -96,8 +96,6 @@ public function refactor(Node $node): ?Node
         }
 
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
-        $hasChangedNode = false;
-
         foreach ($node->getParams() as $param) {
             if ($this->shouldSkipParam($param)) {
                 continue;
@@ -118,11 +116,9 @@ public function refactor(Node $node): ?Node
 
             $paramName = $this->getName($param);
             $this->phpDocTypeChanger->changeParamType($phpDocInfo, $paramType, $param, $paramName);
-
-            $hasChangedNode = true;
         }
 
-        if ($phpDocInfo->hasChanged() && $hasChangedNode) {
+        if ($phpDocInfo->hasChanged()) {
             $this->paramTagRemover->removeParamTagsIfUseless($phpDocInfo, $node);
             return $node;
         }