simpler

rectorphp · Jun 2, 2024 · 0ba5d72 · 0ba5d72
1 parent dafc720
commit 0ba5d72
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 53 deletions.
diff --git a/config/extension.neon b/config/extension.neon
@@ -39,7 +39,6 @@ services:
         arguments:
             - %type_perfect%
 
-    - Rector\TypePerfect\NodeTraverser\SimpleCallableNodeTraverser
     - Rector\TypePerfect\NodeFinder\ClassMethodNodeFinder
     - Rector\TypePerfect\NodeFinder\MethodCallNodeFinder
     - Rector\TypePerfect\NodeFinder\ReturnNodeFinder

diff --git a/src/NodeFinder/ReturnNodeFinder.php b/src/NodeFinder/ReturnNodeFinder.php
@@ -10,15 +10,10 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Return_;
 use PhpParser\NodeTraverser;
-use Rector\TypePerfect\NodeTraverser\SimpleCallableNodeTraverser;
+use Rector\TypePerfect\NodeVisitor\CallableNodeVisitor;
 
 final readonly class ReturnNodeFinder
 {
-    public function __construct(
-        private SimpleCallableNodeTraverser $simpleCallableNodeTraverser
-    ) {
-    }
-
     public function findOnlyReturnsExpr(ClassMethod $classMethod): Expr|null
     {
         $returns = $this->findReturnsWithValues($classMethod);
@@ -37,7 +32,7 @@ public function findReturnsWithValues(ClassMethod $classMethod): array
     {
         $returns = [];
 
-        $this->simpleCallableNodeTraverser->traverseNodesWithCallable((array) $classMethod->stmts, static function (
+        $this->traverseNodesWithCallable((array) $classMethod->stmts, static function (
             Node $node
         ) use (&$returns) {
             // skip different scope
@@ -58,4 +53,17 @@ public function findReturnsWithValues(ClassMethod $classMethod): array
 
         return $returns;
     }
+
+    /**
+     * @param callable(Node $node): (int|Node|null) $callable
+     * @param Node[] $nodes
+     */
+    private function traverseNodesWithCallable(array $nodes, callable $callable): void
+    {
+        $nodeTraverser = new NodeTraverser();
+
+        $callableNodeVisitor = new CallableNodeVisitor($callable);
+        $nodeTraverser->addVisitor($callableNodeVisitor);
+        $nodeTraverser->traverse($nodes);
+    }
 }
diff --git a/src/NodeTraverser/SimpleCallableNodeTraverser.php b/src/NodeTraverser/SimpleCallableNodeTraverser.php
diff --git a/src/NodeVisitor/CallableNodeVisitor.php b/src/NodeVisitor/CallableNodeVisitor.php
@@ -28,7 +28,6 @@ public function __construct(callable $callable)
     public function enterNode(Node $node): int|Node|null
     {
         $originalNode = $node;
-
         $callable = $this->callable;
 
         /** @var int|Node|null $newNode */

diff --git a/src/PhpDoc/ApiDocStmtAnalyzer.php b/src/PhpDoc/ApiDocStmtAnalyzer.php
@@ -13,11 +13,8 @@ final class ApiDocStmtAnalyzer
 {
     public function hasApiDoc(ClassMethod $classMethod, ClassReflection $classReflection): bool
     {
-        if ($classReflection->getResolvedPhpDoc() instanceof ResolvedPhpDocBlock) {
-            $resolvedPhpDoc = $classReflection->getResolvedPhpDoc();
-            if (str_contains($resolvedPhpDoc->getPhpDocString(), '@api')) {
-                return true;
-            }
+        if ($this->hasClassReflectionApiDoc($classReflection)) {
+            return true;
         }
 
         $docComment = $classMethod->getDocComment();
@@ -27,4 +24,14 @@ public function hasApiDoc(ClassMethod $classMethod, ClassReflection $classReflec
 
         return str_contains($docComment->getText(), '@api');
     }
+
+    private function hasClassReflectionApiDoc(ClassReflection $classReflection): bool
+    {
+        if (! $classReflection->getResolvedPhpDoc() instanceof ResolvedPhpDocBlock) {
+            return false;
+        }
+
+        $resolvedPhpDoc = $classReflection->getResolvedPhpDoc();
+        return str_contains($resolvedPhpDoc->getPhpDocString(), '@api');
+    }
 }