[BetterPhpDocParser] Merge PhpDocInfo::getParamTagValueByName() with …

…getParamTagValueNodeByName() (#2703) * [BetterPhpDocParser] Merge PhpDocInfo::getParamTagValueByName() with getParamTagValueNodeByName() * [BetterPhpDocParser] Merge PhpDocInfo::getParamTagValueByName() with getParamTagValueNodeByName()
rectorphp · Jul 23, 2022 · cdf7bf5 · cdf7bf5
1 parent c4d6f19
commit cdf7bf5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php
@@ -145,19 +145,6 @@ public function getParamTagValueNodes(): array
         return $this->phpDocNode->getParamTagValues();
     }
 
-    public function getParamTagValueNodeByName(string $parameterName): ?ParamTagValueNode
-    {
-        foreach ($this->phpDocNode->getParamTagValues() as $paramTagValueNode) {
-            if ($paramTagValueNode->parameterName !== '$' . $parameterName) {
-                continue;
-            }
-
-            return $paramTagValueNode;
-        }
-
-        return null;
-    }
-
     public function getVarType(string $tagName = '@var'): Type
     {
         return $this->getTypeOrMixed($this->getVarTagValueNode($tagName));

diff --git a/packages/BetterPhpDocParser/PhpDocManipulator/PropertyDocBlockManipulator.php b/packages/BetterPhpDocParser/PhpDocManipulator/PropertyDocBlockManipulator.php
@@ -21,7 +21,7 @@ public function renameParameterNameInDocBlock(ParamRename $paramRename): void
         $functionLike = $paramRename->getFunctionLike();
 
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($functionLike);
-        $paramTagValueNode = $phpDocInfo->getParamTagValueNodeByName($paramRename->getCurrentName());
+        $paramTagValueNode = $phpDocInfo->getParamTagValueByName($paramRename->getCurrentName());
         if (! $paramTagValueNode instanceof ParamTagValueNode) {
             return;
         }

diff --git a/rules/Naming/PropertyRenamer/PropertyPromotionRenamer.php b/rules/Naming/PropertyRenamer/PropertyPromotionRenamer.php
@@ -104,7 +104,7 @@ private function renameParamDoc(
         string $paramVarName,
         string $desiredPropertyName
     ): void {
-        $paramTagValueNode = $phpDocInfo->getParamTagValueNodeByName($paramVarName);
+        $paramTagValueNode = $phpDocInfo->getParamTagValueByName($paramVarName);
         if (! $paramTagValueNode instanceof ParamTagValueNode) {
             return;
         }

diff --git a/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php b/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php
@@ -128,7 +128,7 @@ public function refactor(Node $node): ?Node
             $oldName = $this->getName($param->var);
             $this->variableRenamer->renameVariableInFunctionLike($constructClassMethod, $oldName, $propertyName, null);
 
-            $paramTagValueNode = $classMethodPhpDocInfo->getParamTagValueNodeByName($paramName);
+            $paramTagValueNode = $classMethodPhpDocInfo->getParamTagValueByName($paramName);
 
             if (! $paramTagValueNode instanceof ParamTagValueNode) {
                 $this->decorateParamWithPropertyPhpDocInfo($constructClassMethod, $property, $param, $paramName);