[type-declaration-docblocks] Add PrivateClassMethodArrayDocblockParamFromLocalCallsRector

TomasVotruba · TomasVotruba · commit bbfd6bcbaf4b · 2025-09-12T17:41:44.000+02:00
diff --git a/config/set/type-declaration-docblocks.php b/config/set/type-declaration-docblocks.php
@@ -5,6 +5,7 @@
 use Rector\Config\RectorConfig;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnArrayDocblockBasedOnArrayMapRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnDocblockForScalarArrayFromAssignsRector;
+use Rector\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector;
 use Rector\TypeDeclarationDocblocks\Rector\Class_\DocblockVarFromParamDocblockInConstructorRector;
 use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\AddParamArrayDocblockFromDataProviderRector;
 use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\AddParamArrayDocblockFromDimFetchAccessRector;
@@ -24,5 +25,6 @@
         AddReturnDocblockForCommonObjectDenominatorRector::class,
         AddParamArrayDocblockFromDimFetchAccessRector::class,
         AddParamArrayDocblockFromDataProviderRector::class,
+        ClassMethodArrayDocblockParamFromLocalCallsRector::class,
     ]);
 };
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/ClassMethodArrayDocblockParamFromLocalCallsRectorTest.php b/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/ClassMethodArrayDocblockParamFromLocalCallsRectorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class ClassMethodArrayDocblockParamFromLocalCallsRectorTest extends AbstractRectorTestCase
+{
+    #[DataProvider('provideData')]
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/handle_non_final_protected.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/handle_non_final_protected.php.inc
@@ -0,0 +1,38 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+class HandleProtectedMethodInNonFinal
+{
+    public function go()
+    {
+        $this->run(['item1', 'item2']);
+    }
+
+    protected function run(array $items)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+class HandleProtectedMethodInNonFinal
+{
+    public function go()
+    {
+        $this->run(['item1', 'item2']);
+    }
+
+    /**
+     * @param string[] $items
+     */
+    protected function run(array $items)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/handle_non_final_protected_with_parent.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/handle_non_final_protected_with_parent.php.inc
@@ -0,0 +1,42 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+use Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Source\SafeParentClass;
+
+class HandleNonFinalProtectedWithParent extends SafeParentClass
+{
+    public function go()
+    {
+        $this->run(['item1', 'item2']);
+    }
+
+    protected function run(array $items)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+use Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Source\SafeParentClass;
+
+class HandleNonFinalProtectedWithParent extends SafeParentClass
+{
+    public function go()
+    {
+        $this->run(['item1', 'item2']);
+    }
+
+    /**
+     * @param string[] $items
+     */
+    protected function run(array $items)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/handle_protected_method_in_final.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/handle_protected_method_in_final.php.inc
@@ -0,0 +1,42 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+final class HandleProtectedMethodInFinal
+{
+    public function go()
+    {
+        $this->run([2512, 3423]);
+
+        $this->run([324, 534]);
+    }
+
+    protected function run(array $items)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+final class HandleProtectedMethodInFinal
+{
+    public function go()
+    {
+        $this->run([2512, 3423]);
+
+        $this->run([324, 534]);
+    }
+
+    /**
+     * @param int[] $items
+     */
+    protected function run(array $items)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/handle_public.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/handle_public.php.inc
@@ -0,0 +1,44 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+final class HandlePublic
+{
+    public function go()
+    {
+        $this->run([2512, 3423]);
+
+        $this->run([324, 534]);
+    }
+
+    public function run(array $items)
+    {
+    }
+}
+
+?>
+
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+final class HandlePublic
+{
+    public function go()
+    {
+        $this->run([2512, 3423]);
+
+        $this->run([324, 534]);
+    }
+
+    /**
+     * @param int[] $items
+     */
+    public function run(array $items)
+    {
+    }
+}
+
+?>
+
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/multiple_calls.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/multiple_calls.php.inc
@@ -0,0 +1,42 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+final class MultipleCalls
+{
+    public function go()
+    {
+        $this->run(['item1', 'item2']);
+
+        $this->run(['item1', 'item2']);
+    }
+
+    private function run(array $items)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+final class MultipleCalls
+{
+    public function go()
+    {
+        $this->run(['item1', 'item2']);
+
+        $this->run(['item1', 'item2']);
+    }
+
+    /**
+     * @param string[] $items
+     */
+    private function run(array $items)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/some_class.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/some_class.php.inc
@@ -0,0 +1,38 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+class SomeClass
+{
+    public function go()
+    {
+        $this->run(['item1', 'item2']);
+    }
+
+    private function run(array $items)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+class SomeClass
+{
+    public function go()
+    {
+        $this->run(['item1', 'item2']);
+    }
+
+    /**
+     * @param string[] $items
+     */
+    private function run(array $items)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Source/SafeParentClass.php b/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Source/SafeParentClass.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Source;
+
+abstract class SafeParentClass
+{
+}
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/config/configured_rule.php b/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/config/configured_rule.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(ClassMethodArrayDocblockParamFromLocalCallsRector::class);
+};
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector.php
@@ -5,14 +5,13 @@
 namespace Rector\TypeDeclaration\Rector\ClassMethod;
 
 use PhpParser\Node;
-use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
-use Rector\Configuration\Parameter\FeatureFlags;
 use Rector\PhpParser\NodeFinder\LocalMethodCallFinder;
 use Rector\Rector\AbstractRector;
 use Rector\TypeDeclaration\NodeAnalyzer\CallTypesResolver;
 use Rector\TypeDeclaration\NodeAnalyzer\ClassMethodParamTypeCompleter;
+use Rector\TypeDeclarationDocblocks\PrivateMethodFlagger;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -30,6 +29,7 @@ public function __construct(
         private readonly CallTypesResolver $callTypesResolver,
         private readonly ClassMethodParamTypeCompleter $classMethodParamTypeCompleter,
         private readonly LocalMethodCallFinder $localMethodCallFinder,
+        private readonly PrivateMethodFlagger $privateMethodFlagger
     ) {
     }
 
@@ -92,7 +92,7 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            if (! $this->isClassMethodPrivate($node, $classMethod)) {
+            if (! $this->privateMethodFlagger->isClassMethodPrivate($node, $classMethod)) {
                 continue;
             }
 
@@ -120,19 +120,4 @@ public function refactor(Node $node): ?Node
 
         return null;
     }
-
-    private function isClassMethodPrivate(Class_ $class, ClassMethod $classMethod): bool
-    {
-        if ($classMethod->isPrivate()) {
-            return true;
-        }
-
-        if ($classMethod->isFinal() && ! $class->extends instanceof Name && $class->implements === []) {
-            return true;
-        }
-
-        $isClassFinal = $class->isFinal() || FeatureFlags::treatClassesAsFinal($class);
-
-        return $isClassFinal && ! $class->extends instanceof Name && $class->implements === [] && $classMethod->isProtected();
-    }
 }
diff --git a/rules/TypeDeclarationDocblocks/PrivateMethodFlagger.php b/rules/TypeDeclarationDocblocks/PrivateMethodFlagger.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\TypeDeclarationDocblocks;
+
+use PhpParser\Node\Name;
+use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\ClassMethod;
+use Rector\Configuration\Parameter\FeatureFlags;
+
+final class PrivateMethodFlagger
+{
+    public function isClassMethodPrivate(Class_ $class, ClassMethod $classMethod): bool
+    {
+        if ($classMethod->isPrivate()) {
+            return true;
+        }
+
+        if ($classMethod->isFinal() && ! $class->extends instanceof Name && $class->implements === []) {
+            return true;
+        }
+
+        $isClassFinal = $class->isFinal() || FeatureFlags::treatClassesAsFinal($class);
+
+        return $isClassFinal && ! $class->extends instanceof Name && $class->implements === [] && $classMethod->isProtected();
+    }
+}
diff --git a/rules/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector.php b/rules/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector.php

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<?php
++
 +namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Source;
++
 +abstract class SafeParentClass
 +{
 +}