Merge branch 'master' of github.com:Phauthentic/phpstan-rules into dependency-constraints

Author: Florian Krämer

src/CleanCode/ControlStructureNestingRule.php

@@ -4,14 +4,14 @@
 
 namespace Phauthentic\PHPStanRules\CleanCode;
 
+use Phauthentic\PHPStanRules\PhpParser\ParentNodeAttributeVisitor;
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Catch_;
 use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\ElseIf_;
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\TryCatch;
 use PhpParser\NodeTraverser;
-use PhpParser\NodeVisitorAbstract;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -114,27 +114,8 @@ public function addError(int $nestingLevel, Else_|If_|Catch_|ElseIf_|TryCatch $n
         return $errors;
     }
 
-    public function createNodeVisitor(): object
+    public function createNodeVisitor(): ParentNodeAttributeVisitor
     {
-        return new class extends NodeVisitorAbstract {
-            public function enterNode(Node $node)
-            {
-                foreach ($node->getSubNodeNames() as $subNodeName) {
-                    $subNode = $node->$subNodeName;
-                    if (is_array($subNode)) {
-                        foreach ($subNode as $childNode) {
-                            if ($childNode instanceof Node) {
-                                $childNode->setAttribute('parent', $node);
-                            }
-                        }
-                        continue;
-                    }
-
-                    if ($subNode instanceof Node) {
-                        $subNode->setAttribute('parent', $node);
-                    }
-                }
-            }
-        };
+        return new ParentNodeAttributeVisitor();
     }
 }

src/PhpParser/ParentNodeAttributeVisitor.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Phauthentic\PHPStanRules\PhpParser;
+
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
+
+/**
+ * Node visitor that sets parent node attributes on child nodes.
+ *
+ * This enables traversing up the AST tree to determine nesting levels.
+ */
+class ParentNodeAttributeVisitor extends NodeVisitorAbstract
+{
+    /**
+     * @return int|Node|null
+     */
+    public function enterNode(Node $node)
+    {
+        foreach ($node->getSubNodeNames() as $subNodeName) {
+            $subNode = $node->$subNodeName;
+            $this->setParentAttributeForSubNode($subNode, $node);
+        }
+
+        return null;
+    }
+
+    /**
+     * @param mixed $subNode
+     * @param Node $parentNode
+     */
+    private function setParentAttributeForSubNode($subNode, Node $parentNode): void
+    {
+        if (is_array($subNode)) {
+            $this->setParentAttributeForArrayOfNodes($subNode, $parentNode);
+            return;
+        }
+
+        if ($subNode instanceof Node) {
+            $subNode->setAttribute('parent', $parentNode);
+        }
+    }
+
+    /**
+     * @param array<mixed> $nodes
+     * @param Node $parentNode
+     */
+    private function setParentAttributeForArrayOfNodes(array $nodes, Node $parentNode): void
+    {
+        foreach ($nodes as $childNode) {
+            if ($childNode instanceof Node) {
+                $childNode->setAttribute('parent', $parentNode);
+            }
+        }
+    }
+}
+