early return test

Author: TomasVotruba

rules/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector.php

@@ -74,7 +74,7 @@ public function getNodeTypes(): array
     public function refactor(Node $node): ?Node
     {
         // skip as no comments
-        if ($node->getComments() === []) {
+        if (! str_contains((string) $node->getDocComment(), '@param')) {
             return null;
         }
 

rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector.php

@@ -74,6 +74,11 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+        // early return if no @return tag is present
+        if (! str_contains((string) $node->getDocComment(), '@return')) {
+            return null;
+        }
+
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
         $hasChanged = $this->returnTagRemover->removeReturnTagIfUseless($phpDocInfo, $node);
         if (! $hasChanged) {

src/PhpParser/NodeTraverser/RectorNodeTraverser.php

@@ -142,7 +142,6 @@ private function traverseNode(Node $node): void
                 continue;
             }
 
-            $traverseChildren = true;
             $currentNodeVisitors = $this->getVisitorsForNode($subNode);
 
             foreach ($currentNodeVisitors as $currentNodeVisitor) {
@@ -162,29 +161,17 @@ private function traverseNode(Node $node): void
                         // stop traversing as node type changed and visitors won't work
                         continue 2;
                     }
-
-                    //                } elseif ($return === NodeVisitor::DONT_TRAVERSE_CHILDREN) {
-                    //                    $traverseChildren = false;
-                    //                } elseif ($return === NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN) {
-                    //                    $traverseChildren = false;
-                    //                    break;
-                    //                } elseif ($return === NodeVisitor::STOP_TRAVERSAL) {
-                    //                    $this->stopTraversal = true;
-                    //                    break 2;
-                    //                } elseif ($return === NodeVisitor::REPLACE_WITH_NULL) {
-                    //                    $node->{$name} = null;
-                    //                    continue 2;
                 } else {
                     throw new LogicException('RectorRunner::run() returned invalid value of type ' . gettype($return));
                 }
             }
 
-            if ($traverseChildren) {
-                $this->traverseNode($subNode);
-                if ($this->stopTraversal) {
-                    break;
-                }
+            //            if ($traverseChildren) {
+            $this->traverseNode($subNode);
+            if ($this->stopTraversal) {
+                break;
             }
+            //            }
         }
     }
 
@@ -225,29 +212,15 @@ private function traverseArray(array $nodes): array
                     } elseif ($return === NodeVisitor::REMOVE_NODE) {
                         $doNodes[] = [$i, []];
                         continue 2;
-                    } elseif ($return === NodeVisitor::DONT_TRAVERSE_CHILDREN) {
-                        $traverseChildren = false;
-                    } elseif ($return === NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN) {
-                        $traverseChildren = false;
-                        break;
-                    } elseif ($return === NodeVisitor::STOP_TRAVERSAL) {
-                        $this->stopTraversal = true;
-                        break 2;
-                    } elseif ($return === NodeVisitor::REPLACE_WITH_NULL) {
-                        throw new LogicException(
-                            'REPLACE_WITH_NULL can not be used if the parent structure is an array'
-                        );
                     } else {
                         throw new LogicException('RectorRunner::run() returned invalid value of type ' . gettype($return));
                     }
                 }
             }
 
-            if ($traverseChildren) {
-                $this->traverseNode($node);
-                if ($this->stopTraversal) {
-                    break;
-                }
+            $this->traverseNode($node);
+            if ($this->stopTraversal) {
+                break;
             }
         }