refactor(FuncCall): Update RenameAppFunctionToResolveFunctionRector

- Change the base class from AbstractRector to AbstractProxyRector.
- Simplify the constructor by removing the RenameFunctionRector dependency.
- Implement the applyRefactor method to utilize the parent class's functionality.
- Add a proxyRectorClass method to define the associated RenameFunctionRector.

Author: guanguans

baselines/missingType.return.neon

@@ -3,6 +3,6 @@
 parameters:
     ignoreErrors:
         -
-            message: '#^Method Guanguans\\RectorRules\\Rector\\AbstractProxyRector\:\:applyRefactor\(\) has no return type specified\.$#'
+            message: '#^Method Guanguans\\RectorRules\\Rector\\AbstractProxyRector\:\:rawRefactor\(\) has no return type specified\.$#'
             count: 1
             path: ../src/Rector/AbstractProxyRector.php

baselines/typeCoverage.returnTypeCoverage.neon

@@ -3,6 +3,6 @@
 parameters:
     ignoreErrors:
         -
-            message: '#^Out of 86 possible return types, only 84 \- 97\.6 %% actually have it\. Add more return types to get over 100 %%$#'
+            message: '#^Out of 88 possible return types, only 86 \- 97\.7 %% actually have it\. Add more return types to get over 100 %%$#'
             count: 2
             path: ../src/Rector/AbstractProxyRector.php

composer-dependency-analyser.php

@@ -27,7 +27,7 @@
         __DIR__.'/tests/',
     ])
     ->ignoreUnknownClasses([
-        // CodeSample::class,
+        CodeSample::class,
     ])
     /** @see \ShipMonk\ComposerDependencyAnalyser\Analyser::CORE_EXTENSIONS */
     ->ignoreErrorsOnExtensions(

phpstan.neon.dist

@@ -131,15 +131,15 @@ parameters:
         - identifier: cast.int
         - identifier: encapsedStringPart.nonString
         - identifier: method.childParameterType
-        - identifier: method.dynamicName
+#        - identifier: method.dynamicName
         - identifier: return.type
         - identifier: symplify.explicitInterfaceSuffixName
         - identifier: symplify.forbiddenArrayMethodCall
         - identifier: symplify.forbiddenNode
         - identifier: symplify.forbiddenStaticClassConstFetch
         - identifier: symplify.noArrayMapWithArrayCallable
-        - identifier: symplify.noDynamicName
-#        - message: '#^Unused Guanguans\\RectorRules\\Rector\\.*\\.*\:\:__construct$#'
+#        - identifier: symplify.noDynamicName
+        - message: '#^Unused Guanguans\\RectorRules\\Rector\\.*\\.*\:\:__construct$#'
         - message: '#^Cannot call method (all|reduce|getParameterOption)\(\) on mixed\.$#'
 
         -

src/Rector/AbstractProxyRector.php

@@ -23,59 +23,66 @@
  */
 abstract class AbstractProxyRector extends AbstractRector
 {
-    protected RectorConfig $rectorConfig;
-    protected \Rector\Rector\AbstractRector $proxyRector;
+    // /** @param list<mixed> $arguments */
+    // public function __call(string $name, array $arguments)
+    // {return $this->makeProxyRector()->{$name}(...$arguments);}
 
     /**
-     * @see \Rector\Testing\PHPUnit\AbstractLazyTestCase::getContainer()
-     *
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     *
+     * {@inheritDoc}
      */
-    public function __construct()
+    final public function getNodeTypes(): array
     {
-        $rectorConfig = (new LazyContainerFactory)->create();
-        $rectorConfig->boot();
-        $this->rectorConfig = $rectorConfig;
-        $this->proxyRector = clone $rectorConfig->make($this->proxyRectorClass());
+        return $this->makeProxyRector()->getNodeTypes();
     }
 
     /**
-     * @param list<mixed> $arguments
+     * {@inheritDoc}
      *
-     * @return mixed
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
-    public function __call(string $name, array $arguments)
+    final public function refactor(Node $node)
     {
-        return $this->proxyRector->{$name}(...$arguments);
+        return $this->rawRefactor($node);
     }
 
     /**
-     * @throws \ReflectionException
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      *
-     * {@inheritDoc}
+     * @return null|list<Node>|NodeVisitor::REMOVE_NODE|\PhpParser\Node
      */
-    final public function getNodeTypes(): array
+    protected function rawRefactor(Node $node)
     {
-        /** @var \ReflectionClass<\Rector\Rector\AbstractRector> $reflectionClass */
-        $reflectionClass = new \ReflectionClass($this->proxyRectorClass());
-
-        return $reflectionClass->newInstanceWithoutConstructor()->getNodeTypes();
+        return $this->makeProxyRector()->refactor($node);
     }
 
     /**
-     * {@inheritDoc}
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     *
+     * @return \Rector\Contract\Rector\ConfigurableRectorInterface&\Rector\Rector\AbstractRector
      */
-    final public function refactor(Node $node)
+    protected function makeProxyRector(): \Rector\Rector\AbstractRector
     {
-        return $this->applyRefactor($node);
+        return $this->makeRectorConfig()->make($this->proxyRectorClass());
     }
 
     /**
-     * @return null|list<Node>|NodeVisitor::REMOVE_NODE|\PhpParser\Node
+     * @see \Rector\Testing\PHPUnit\AbstractLazyTestCase::getContainer()
      */
-    protected function applyRefactor(Node $node)
+    protected function makeRectorConfig(): RectorConfig
     {
-        return $this->proxyRector->refactor($node);
+        static $rectorConfig;
+
+        if ($rectorConfig instanceof RectorConfig) {
+            return $rectorConfig;
+        }
+
+        $rectorConfig = (new LazyContainerFactory)->create();
+        $rectorConfig->singletonIf($this->proxyRectorClass());
+        $rectorConfig->boot();
+
+        return $rectorConfig;
     }
 
     /**

src/Rector/Array_/SortListItemOfSameScalarTypeRector.php

@@ -129,10 +129,10 @@ public function refactor(Node $node): ?Node
 
     /**
      * @param array{
-     *     ignore_comment: bool,
-     *     ignore_docblock: bool,
-     *     sort_comparator: callable(string, string): int,
-     *     sort_direction: key-of<self::SORT_DIRECTION_MAP>,
+     *     ignore_comment?: bool,
+     *     ignore_docblock?: bool,
+     *     sort_comparator?: callable(string, string): int,
+     *     sort_direction?: key-of<self::SORT_DIRECTION_MAP>,
      * } $configuration
      */
     public function configure(array $configuration): void

src/Rector/Class_/UpdateRectorMethodNodeParamDocblockFromNodeTypesRector.php

@@ -96,7 +96,7 @@ protected function classType(): string
 
     protected function classMethodNode(Class_ $classNode): ?ClassMethod
     {
-        return $classNode->getMethod('refactor');
+        return $classNode->getMethod('refactor') ?? $classNode->getMethod('rawRefactor');
     }
 
     /**

src/Rector/FuncCall/RenameAppFunctionToResolveFunctionRector.php

@@ -14,53 +14,16 @@
 
 namespace Guanguans\RectorRules\Rector\FuncCall;
 
-use Guanguans\RectorRules\Rector\AbstractRector;
+use Guanguans\RectorRules\Rector\AbstractProxyRector;
 use PhpParser\Node;
-use PhpParser\Node\Expr\FuncCall;
 use Rector\Renaming\Rector\FuncCall\RenameFunctionRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 
 /**
  * @see \Guanguans\RectorRulesTests\Rector\FuncCall\RenameAppFunctionToResolveFunctionRector\RenameAppFunctionToResolveFunctionRectorTest
  */
-final class RenameAppFunctionToResolveFunctionRector extends AbstractRector
+final class RenameAppFunctionToResolveFunctionRector extends AbstractProxyRector
 {
-    private RenameFunctionRector $renameFunctionRector;
-
-    public function __construct(RenameFunctionRector $renameFunctionRector)
-    {
-        $this->renameFunctionRector = clone $renameFunctionRector;
-        $this->renameFunctionRector->configure([
-            'app' => 'resolve',
-        ]);
-    }
-
-    /**
-     * @throws \ReflectionException
-     */
-    public function getNodeTypes(): array
-    {
-        // return $this->renameFunctionRector->getNodeTypes();
-        return (new \ReflectionClass(RenameFunctionRector::class))->newInstanceWithoutConstructor()->getNodeTypes();
-    }
-
-    /**
-     * @see https://github.com/driftingly/rector-laravel/blob/main/src/Rector/FuncCall/AppToResolveRector.php
-     * @see https://github.com/laravel/framework/commit/8f232a972fd8b4bfa1901a47c1e649e2a1278bd6
-     *
-     * @param \PhpParser\Node\Expr\FuncCall $node
-     */
-    public function refactor(Node $node): ?Node
-    {
-        $abstract = $node->getArg('abstract', 0);
-
-        if (null === $abstract || $this->getType($abstract->value)->isNull()->yes()) {
-            return null;
-        }
-
-        return $this->renameFunctionRector->refactor($node);
-    }
-
     /**
      * @return list<\Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample>
      */
@@ -89,4 +52,32 @@ protected function codeSamples(): array
             ),
         ];
     }
+
+    /**
+     * @see https://github.com/driftingly/rector-laravel/blob/main/src/Rector/FuncCall/AppToResolveRector.php
+     * @see https://github.com/laravel/framework/commit/8f232a972fd8b4bfa1901a47c1e649e2a1278bd6
+     *
+     * @param \PhpParser\Node\Expr\FuncCall $node
+     *
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    protected function rawRefactor(Node $node): ?Node
+    {
+        $abstract = $node->getArg('abstract', 0);
+
+        if (null === $abstract || $this->getType($abstract->value)->isNull()->yes()) {
+            return null;
+        }
+
+        $this->makeProxyRector()->configure([
+            'app' => 'resolve',
+        ]);
+
+        return parent::rawRefactor($node);
+    }
+
+    protected function proxyRectorClass(): string
+    {
+        return RenameFunctionRector::class;
+    }
 }

tests/Rector/FuncCall/RenameAppFunctionToResolveFunctionRector/RenameAppFunctionToResolveFunctionRectorTest.php

@@ -23,6 +23,7 @@
 use Guanguans\RectorRulesTests\Rector\AbstractRectorTestCase;
 
 /**
+ * @covers \Guanguans\RectorRules\Rector\AbstractProxyRector
  * @covers \Guanguans\RectorRules\Rector\FuncCall\RenameAppFunctionToResolveFunctionRector
  */
 final class RenameAppFunctionToResolveFunctionRectorTest extends AbstractRectorTestCase