Simplify NodeTraverser->traverseArray()

Author: staabm

lib/PhpParser/NodeTraverser.php

@@ -176,77 +176,80 @@ protected function traverseArray(array $nodes): array {
  $doNodes = [];
 
  foreach ($nodes as $i => $node) {
- if ($node instanceof Node) {
- $traverseChildren = true;
- $visitorIndex = -1;
-
- foreach ($this->visitors as $visitorIndex => $visitor) {
- $return = $visitor->enterNode($node);
- if (null !== $return) {
- if ($return instanceof Node) {
- $this->ensureReplacementReasonable($node, $return);
- $nodes[$i] = $node = $return;
- } elseif (\is_array($return)) {
- $doNodes[] = [$i, $return];
- continue 2;
- } elseif (NodeVisitor::REMOVE_NODE === $return) {
- $doNodes[] = [$i, []];
- continue 2;
- } elseif (NodeVisitor::DONT_TRAVERSE_CHILDREN === $return) {
- $traverseChildren = false;
- } elseif (NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN === $return) {
- $traverseChildren = false;
- break;
- } elseif (NodeVisitor::STOP_TRAVERSAL === $return) {
- $this->stopTraversal = true;
- break 2;
- } elseif (NodeVisitor::REPLACE_WITH_NULL === $return) {
- throw new \LogicException(
- 'REPLACE_WITH_NULL can not be used if the parent structure is an array');
- } else {
- throw new \LogicException(
- 'enterNode() returned invalid value of type ' . gettype($return)
- );
- }
- }
+ if (!$node instanceof Node) {
+ if (\is_array($node)) {
+ throw new \LogicException('Invalid node structure: Contains nested arrays');
  }
+ continue;
+ }
 
- if ($traverseChildren) {
- $this->traverseNode($node);
- if ($this->stopTraversal) {
+ $traverseChildren = true;
+ $visitorIndex = -1;
+
+ foreach ($this->visitors as $visitorIndex => $visitor) {
+ $return = $visitor->enterNode($node);
+ if (null !== $return) {
+ if ($return instanceof Node) {
+ $this->ensureReplacementReasonable($node, $return);
+ $nodes[$i] = $node = $return;
+ } elseif (\is_array($return)) {
+ $doNodes[] = [$i, $return];
+ continue 2;
+ } elseif (NodeVisitor::REMOVE_NODE === $return) {
+ $doNodes[] = [$i, []];
+ continue 2;
+ } elseif (NodeVisitor::DONT_TRAVERSE_CHILDREN === $return) {
+ $traverseChildren = false;
+ } elseif (NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN === $return) {
+ $traverseChildren = false;
  break;
+ } elseif (NodeVisitor::STOP_TRAVERSAL === $return) {
+ $this->stopTraversal = true;
+ break 2;
+ } elseif (NodeVisitor::REPLACE_WITH_NULL === $return) {
+ throw new \LogicException(
+ 'REPLACE_WITH_NULL can not be used if the parent structure is an array');
+ } else {
+ throw new \LogicException(
+ 'enterNode() returned invalid value of type ' . gettype($return)
+ );
  }
  }
+ }
 
- for (; $visitorIndex >= 0; --$visitorIndex) {
- $visitor = $this->visitors[$visitorIndex];
- $return = $visitor->leaveNode($node);
+ if ($traverseChildren) {
+ $this->traverseNode($node);
+ if ($this->stopTraversal) {
+ break;
+ }
+ }
 
- if (null !== $return) {
- if ($return instanceof Node) {
- $this->ensureReplacementReasonable($node, $return);
- $nodes[$i] = $node = $return;
- } elseif (\is_array($return)) {
- $doNodes[] = [$i, $return];
- break;
- } elseif (NodeVisitor::REMOVE_NODE === $return) {
- $doNodes[] = [$i, []];
- break;
- } elseif (NodeVisitor::STOP_TRAVERSAL === $return) {
- $this->stopTraversal = true;
- break 2;
- } elseif (NodeVisitor::REPLACE_WITH_NULL === $return) {
- throw new \LogicException(
- 'REPLACE_WITH_NULL can not be used if the parent structure is an array');
- } else {
- throw new \LogicException(
- 'leaveNode() returned invalid value of type ' . gettype($return)
- );
- }
+ for (; $visitorIndex >= 0; --$visitorIndex) {
+ $visitor = $this->visitors[$visitorIndex];
+ $return = $visitor->leaveNode($node);
+
+ if (null !== $return) {
+ if ($return instanceof Node) {
+ $this->ensureReplacementReasonable($node, $return);
+ $nodes[$i] = $node = $return;
+ } elseif (\is_array($return)) {
+ $doNodes[] = [$i, $return];
+ break;
+ } elseif (NodeVisitor::REMOVE_NODE === $return) {
+ $doNodes[] = [$i, []];
+ break;
+ } elseif (NodeVisitor::STOP_TRAVERSAL === $return) {
+ $this->stopTraversal = true;
+ break 2;
+ } elseif (NodeVisitor::REPLACE_WITH_NULL === $return) {
+ throw new \LogicException(
+ 'REPLACE_WITH_NULL can not be used if the parent structure is an array');
+ } else {
+ throw new \LogicException(
+ 'leaveNode() returned invalid value of type ' . gettype($return)
+ );
  }
  }
- } elseif (\is_array($node)) {
- throw new \LogicException('Invalid node structure: Contains nested arrays');
  }
  }