Merge pull request #7675 from samsonasik/rector-refactor-under

[Rector] Refactor UnderscoreToCamelCaseVariableNameRector as removed findParentByType()

Author: samsonasik

utils/Rector/UnderscoreToCamelCaseVariableNameRector.php

@@ -113,13 +113,16 @@ public function refactor(Node $node): ?Node
 
     private function updateDocblock(Variable $variable, string $variableName, string $camelCaseName): void
     {
-        $parentClassMethodOrFunction = $this->betterNodeFinder->findParentByTypes($variable, [ClassMethod::class, Function_::class]);
+        $parentFunctionLike = $this->betterNodeFinder->findParentType($variable, ClassMethod::class);
 
-        if ($parentClassMethodOrFunction === null) {
-            return;
+        if ($parentFunctionLike === null) {
+            $parentFunctionLike = $this->betterNodeFinder->findParentType($variable, Function_::class);
+            if ($parentFunctionLike === null) {
+                return;
+            }
         }
 
-        $docComment = $parentClassMethodOrFunction->getDocComment();
+        $docComment = $parentFunctionLike->getDocComment();
         if ($docComment === null) {
             return;
         }
@@ -133,7 +136,7 @@ private function updateDocblock(Variable $variable, string $variableName, string
             return;
         }
 
-        $phpDocInfo         = $this->phpDocInfoFactory->createFromNodeOrEmpty($parentClassMethodOrFunction);
+        $phpDocInfo         = $this->phpDocInfoFactory->createFromNodeOrEmpty($parentFunctionLike);
         $paramTagValueNodes = $phpDocInfo->getParamTagValueNodes();
 
         foreach ($paramTagValueNodes as $paramTagValueNode) {
@@ -143,6 +146,6 @@ private function updateDocblock(Variable $variable, string $variableName, string
             }
         }
 
-        $parentClassMethodOrFunction->setDocComment(new Doc($phpDocInfo->getPhpDocNode()->__toString()));
+        $parentFunctionLike->setDocComment(new Doc($phpDocInfo->getPhpDocNode()->__toString()));
     }
 }