@appthreat/atom 1.8.1 → 1.8.2

package/plugins/nikic/php-parser/lib/PhpParser/NodeVisitor.php

@@ -2,49 +2,8 @@
 
 namespace PhpParser;
 
-interface NodeVisitor {
-    /**
-     * If NodeVisitor::enterNode() returns DONT_TRAVERSE_CHILDREN, child nodes
-     * of the current node will not be traversed for any visitors.
-     *
-     * For subsequent visitors enterNode() will still be called on the current
-     * node and leaveNode() will also be invoked for the current node.
-     */
-    public const DONT_TRAVERSE_CHILDREN = 1;
-
-    /**
-     * If NodeVisitor::enterNode() or NodeVisitor::leaveNode() returns
-     * STOP_TRAVERSAL, traversal is aborted.
-     *
-     * The afterTraverse() method will still be invoked.
-     */
-    public const STOP_TRAVERSAL = 2;
-
-    /**
-     * If NodeVisitor::leaveNode() returns REMOVE_NODE for a node that occurs
-     * in an array, it will be removed from the array.
-     *
-     * For subsequent visitors leaveNode() will still be invoked for the
-     * removed node.
-     */
-    public const REMOVE_NODE = 3;
-
-    /**
-     * If NodeVisitor::enterNode() returns DONT_TRAVERSE_CURRENT_AND_CHILDREN, child nodes
-     * of the current node will not be traversed for any visitors.
-     *
-     * For subsequent visitors enterNode() will not be called as well.
-     * leaveNode() will be invoked for visitors that has enterNode() method invoked.
-     */
-    public const DONT_TRAVERSE_CURRENT_AND_CHILDREN = 4;
-
-    /**
-     * If NodeVisitor::enterNode() or NodeVisitor::leaveNode() returns REPLACE_WITH_NULL,
-     * the node will be replaced with null. This is not a legal return value if the node is part
-     * of an array, rather than another node.
-     */
-    public const REPLACE_WITH_NULL = 5;
-
+interface NodeVisitor
+{
     /**
      * Called once before traversal.
      *
@@ -64,25 +23,16 @@ interface NodeVisitor {
      * Return value semantics:
      *  * null
      *        => $node stays as-is
-     *  * array (of Nodes)
-     *        => The return value is merged into the parent array (at the position of the $node)
-     *  * NodeVisitor::REMOVE_NODE
-     *        => $node is removed from the parent array
-     *  * NodeVisitor::REPLACE_WITH_NULL
-     *        => $node is replaced with null
-     *  * NodeVisitor::DONT_TRAVERSE_CHILDREN
+     *  * NodeTraverser::DONT_TRAVERSE_CHILDREN
      *        => Children of $node are not traversed. $node stays as-is
-     *  * NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN
-     *        => Further visitors for the current node are skipped, and its children are not
-     *           traversed. $node stays as-is.
-     *  * NodeVisitor::STOP_TRAVERSAL
+     *  * NodeTraverser::STOP_TRAVERSAL
      *        => Traversal is aborted. $node stays as-is
      *  * otherwise
      *        => $node is set to the return value
      *
      * @param Node $node Node
      *
-     * @return null|int|Node|Node[] Replacement node (or special return value)
+     * @return null|int|Node Replacement node (or special return value)
      */
     public function enterNode(Node $node);
 
@@ -92,11 +42,9 @@ interface NodeVisitor {
      * Return value semantics:
      *  * null
      *        => $node stays as-is
-     *  * NodeVisitor::REMOVE_NODE
+     *  * NodeTraverser::REMOVE_NODE
      *        => $node is removed from the parent array
-     *  * NodeVisitor::REPLACE_WITH_NULL
-     *        => $node is replaced with null
-     *  * NodeVisitor::STOP_TRAVERSAL
+     *  * NodeTraverser::STOP_TRAVERSAL
      *        => Traversal is aborted. $node stays as-is
      *  * array (of Nodes)
      *        => The return value is merged into the parent array (at the position of the $node)

package/plugins/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php

@@ -5,7 +5,8 @@ namespace PhpParser;
 /**
  * @codeCoverageIgnore
  */
-abstract class NodeVisitorAbstract implements NodeVisitor {
+class NodeVisitorAbstract implements NodeVisitor
+{
     public function beforeTraverse(array $nodes) {
         return null;
     }

package/plugins/nikic/php-parser/lib/PhpParser/Parser/Multiple.php

@@ -0,0 +1,55 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Parser;
+
+use PhpParser\Error;
+use PhpParser\ErrorHandler;
+use PhpParser\Parser;
+
+class Multiple implements Parser
+{
+    /** @var Parser[] List of parsers to try, in order of preference */
+    private $parsers;
+
+    /**
+     * Create a parser which will try multiple parsers in an order of preference.
+     *
+     * Parsers will be invoked in the order they're provided to the constructor. If one of the
+     * parsers runs without throwing, it's output is returned. Otherwise the exception that the
+     * first parser generated is thrown.
+     *
+     * @param Parser[] $parsers
+     */
+    public function __construct(array $parsers) {
+        $this->parsers = $parsers;
+    }
+
+    public function parse(string $code, ErrorHandler $errorHandler = null) {
+        if (null === $errorHandler) {
+            $errorHandler = new ErrorHandler\Throwing;
+        }
+
+        list($firstStmts, $firstError) = $this->tryParse($this->parsers[0], $errorHandler, $code);
+        if ($firstError === null) {
+            return $firstStmts;
+        }
+
+        for ($i = 1, $c = count($this->parsers); $i < $c; ++$i) {
+            list($stmts, $error) = $this->tryParse($this->parsers[$i], $errorHandler, $code);
+            if ($error === null) {
+                return $stmts;
+            }
+        }
+
+        throw $firstError;
+    }
+
+    private function tryParse(Parser $parser, ErrorHandler $errorHandler, $code) {
+        $stmts = null;
+        $error = null;
+        try {
+            $stmts = $parser->parse($code, $errorHandler);
+        } catch (Error $error) {}
+        return [$stmts, $error];
+    }
+}