@appthreat/atom 1.8.1 → 1.8.2

package/plugins/nikic/php-parser/README.md

@@ -3,24 +3,24 @@ PHP Parser
 
 [![Coverage Status](https://coveralls.io/repos/github/nikic/PHP-Parser/badge.svg?branch=master)](https://coveralls.io/github/nikic/PHP-Parser?branch=master)
 
-This is a PHP parser written in PHP. Its purpose is to simplify static code analysis and
+This is a PHP 5.2 to PHP 8.2 parser written in PHP. Its purpose is to simplify static code analysis and
 manipulation.
 
-[**Documentation for version 5.x**][doc_master] (current; for running on PHP >= 7.4; for parsing PHP 7.0 to PHP 8.3, with limited support for parsing PHP 5.x).
+[**Documentation for version 4.x**][doc_4_x] (stable; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 8.2).
 
-[Documentation for version 4.x][doc_4_x] (supported; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 8.3).
+[Documentation for version 3.x][doc_3_x] (unsupported; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.2).
 
 Features
 --------
 
 The main features provided by this library are:
 
- * Parsing PHP 7, and PHP 8 code into an abstract syntax tree (AST).
+ * Parsing PHP 5, PHP 7, and PHP 8 code into an abstract syntax tree (AST).
    * Invalid code can be parsed into a partial AST.
    * The AST contains accurate location information.
  * Dumping the AST in human-readable form.
  * Converting an AST back to PHP code.
-   * Formatting can be preserved for partially changed ASTs.
+   * Experimental: Formatting can be preserved for partially changed ASTs.
  * Infrastructure to traverse and modify ASTs.
  * Resolution of namespaced names.
  * Evaluation of constant expressions.
@@ -51,7 +51,7 @@ function test($foo)
 }
 CODE;
 
-$parser = (new ParserFactory())->createForNewestSupportedVersion();
+$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
 try {
     $ast = $parser->parse($code);
 } catch (Error $error) {
@@ -68,17 +68,12 @@ This dumps an AST looking something like this:
 ```
 array(
     0: Stmt_Function(
-        attrGroups: array(
-        )
         byRef: false
         name: Identifier(
             name: test
         )
         params: array(
             0: Param(
-                attrGroups: array(
-                )
-                flags: 0
                 type: null
                 byRef: false
                 variadic: false
@@ -93,11 +88,12 @@ array(
             0: Stmt_Expression(
                 expr: Expr_FuncCall(
                     name: Name(
-                        name: var_dump
+                        parts: array(
+                            0: var_dump
+                        )
                     )
                     args: array(
                         0: Arg(
-                            name: null
                             value: Expr_Variable(
                                 name: foo
                             )
@@ -139,16 +135,12 @@ This gives us an AST where the `Function_::$stmts` are empty:
 ```
 array(
     0: Stmt_Function(
-        attrGroups: array(
-        )
         byRef: false
         name: Identifier(
             name: test
         )
         params: array(
             0: Param(
-                attrGroups: array(
-                )
                 type: null
                 byRef: false
                 variadic: false
@@ -211,8 +203,9 @@ Component documentation:
  * [AST builders](doc/component/AST_builders.markdown)
    * Fluent builders for AST nodes
  * [Lexer](doc/component/Lexer.markdown)
-   * Emulation
-   * Tokens, positions and attributes
+   * Lexer options
+   * Token and file positions for nodes
+   * Custom attributes
  * [Error handling](doc/component/Error_handling.markdown)
    * Column information for errors
    * Error recovery (parsing of syntactically incorrect code)
@@ -230,4 +223,3 @@ Component documentation:
 
  [doc_3_x]: https://github.com/nikic/PHP-Parser/tree/3.x/doc
  [doc_4_x]: https://github.com/nikic/PHP-Parser/tree/4.x/doc
- [doc_master]: https://github.com/nikic/PHP-Parser/tree/master/doc

package/plugins/nikic/php-parser/bin/php-parse

@@ -26,7 +26,13 @@ if (empty($files)) {
     showHelp("Must specify at least one file.");
 }
 
-$parser = (new PhpParser\ParserFactory())->createForVersion($attributes['version']);
+$lexer = new PhpParser\Lexer\Emulative(['usedAttributes' => [
+    'startLine', 'endLine', 'startFilePos', 'endFilePos', 'comments'
+]]);
+$parser = (new PhpParser\ParserFactory)->create(
+    PhpParser\ParserFactory::PREFER_PHP7,
+    $lexer
+);
 $dumper = new PhpParser\NodeDumper([
     'dumpComments' => true,
     'dumpPositions' => $attributes['with-positions'],
@@ -37,10 +43,7 @@ $traverser = new PhpParser\NodeTraverser();
 $traverser->addVisitor(new PhpParser\NodeVisitor\NameResolver);
 
 foreach ($files as $file) {
-    if ($file === '-') {
-        $code = file_get_contents('php://stdin');
-        fwrite(STDERR, "====> Stdin:\n");
-    } else if (strpos($file, '<?php') === 0) {
+    if (strpos($file, '<?php') === 0) {
         $code = $file;
         fwrite(STDERR, "====> Code $code\n");
     } else {
@@ -105,7 +108,7 @@ function showHelp($error = '') {
     if ($error) {
         fwrite(STDERR, $error . "\n\n");
     }
-    fwrite($error ? STDERR : STDOUT, <<<'OUTPUT'
+    fwrite($error ? STDERR : STDOUT, <<<OUTPUT
 Usage: php-parse [operations] file1.php [file2.php ...]
    or: php-parse [operations] "<?php code"
 Turn PHP source code into an abstract syntax tree.
@@ -120,7 +123,6 @@ Operations is a list of the following options (--dump by default):
     -c, --with-column-info  Show column-numbers for errors (if available)
     -P, --with-positions    Show positions in node dumps
     -r, --with-recovery     Use parsing with error recovery
-        --version=VERSION   Target specific PHP version (default: newest)
     -h, --help              Display this page
 
 Example:
@@ -141,7 +143,6 @@ function parseArgs($args) {
         'with-column-info' => false,
         'with-positions' => false,
         'with-recovery' => false,
-        'version' => PhpParser\PhpVersion::getNewestSupported(),
     ];
 
     array_shift($args);
@@ -192,9 +193,7 @@ function parseArgs($args) {
                 $parseOptions = false;
                 break;
             default:
-                if (preg_match('/^--version=(.*)$/', $arg, $matches)) {
-                    $attributes['version'] = PhpParser\PhpVersion::fromString($matches[1]);
-                } elseif ($arg[0] === '-' && \strlen($arg[0]) > 1) {
+                if ($arg[0] === '-') {
                     showHelp("Invalid operation $arg.");
                 } else {
                     $files[] = $arg;

package/plugins/nikic/php-parser/composer.json

@@ -13,18 +13,16 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
-        "ext-tokenizer": "*",
-        "ext-json": "*",
-        "ext-ctype": "*"
+        "php": ">=7.0",
+        "ext-tokenizer": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0",
         "ircmaxell/php-yacc": "^0.0.7"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.0-dev"
+            "dev-master": "4.9-dev"
         }
     },
     "autoload": {

package/plugins/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php

@@ -6,28 +6,26 @@ namespace PhpParser\Builder;
 
 use PhpParser;
 use PhpParser\BuilderHelpers;
-use PhpParser\Modifiers;
 use PhpParser\Node;
 use PhpParser\Node\Const_;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt;
 
-class ClassConst implements PhpParser\Builder {
-    protected int $flags = 0;
-    /** @var array<string, mixed> */
-    protected array $attributes = [];
-    /** @var list<Const_> */
-    protected array $constants = [];
+class ClassConst implements PhpParser\Builder
+{
+    protected $flags = 0;
+    protected $attributes = [];
+    protected $constants = [];
 
-    /** @var list<Node\AttributeGroup> */
-    protected array $attributeGroups = [];
-    /** @var Identifier|Node\Name|Node\ComplexType|null */
-    protected ?Node $type = null;
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
+    /** @var Identifier|Node\Name|Node\ComplexType */
+    protected $type;
 
     /**
      * Creates a class constant builder
      *
-     * @param string|Identifier $name Name
+     * @param string|Identifier                          $name  Name
      * @param Node\Expr|bool|null|int|float|string|array $value Value
      */
     public function __construct($name, $value) {
@@ -37,7 +35,7 @@ class ClassConst implements PhpParser\Builder {
     /**
      * Add another constant to const group
      *
-     * @param string|Identifier $name Name
+     * @param string|Identifier                          $name  Name
      * @param Node\Expr|bool|null|int|float|string|array $value Value
      *
      * @return $this The builder instance (for fluid interface)
@@ -54,7 +52,7 @@ class ClassConst implements PhpParser\Builder {
      * @return $this The builder instance (for fluid interface)
      */
     public function makePublic() {
-        $this->flags = BuilderHelpers::addModifier($this->flags, Modifiers::PUBLIC);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PUBLIC);
 
         return $this;
     }
@@ -65,7 +63,7 @@ class ClassConst implements PhpParser\Builder {
      * @return $this The builder instance (for fluid interface)
      */
     public function makeProtected() {
-        $this->flags = BuilderHelpers::addModifier($this->flags, Modifiers::PROTECTED);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PROTECTED);
 
         return $this;
     }
@@ -76,7 +74,7 @@ class ClassConst implements PhpParser\Builder {
      * @return $this The builder instance (for fluid interface)
      */
     public function makePrivate() {
-        $this->flags = BuilderHelpers::addModifier($this->flags, Modifiers::PRIVATE);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PRIVATE);
 
         return $this;
     }
@@ -87,7 +85,7 @@ class ClassConst implements PhpParser\Builder {
      * @return $this The builder instance (for fluid interface)
      */
     public function makeFinal() {
-        $this->flags = BuilderHelpers::addModifier($this->flags, Modifiers::FINAL);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_FINAL);
 
         return $this;
     }

package/plugins/nikic/php-parser/lib/PhpParser/Builder/Class_.php

@@ -4,27 +4,25 @@ namespace PhpParser\Builder;
 
 use PhpParser;
 use PhpParser\BuilderHelpers;
-use PhpParser\Modifiers;
 use PhpParser\Node;
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt;
 
-class Class_ extends Declaration {
-    protected string $name;
-    protected ?Name $extends = null;
-    /** @var list<Name> */
-    protected array $implements = [];
-    protected int $flags = 0;
-    /** @var list<Stmt\TraitUse> */
-    protected array $uses = [];
-    /** @var list<Stmt\ClassConst> */
-    protected array $constants = [];
-    /** @var list<Stmt\Property> */
-    protected array $properties = [];
-    /** @var list<Stmt\ClassMethod> */
-    protected array $methods = [];
-    /** @var list<Node\AttributeGroup> */
-    protected array $attributeGroups = [];
+class Class_ extends Declaration
+{
+    protected $name;
+
+    protected $extends = null;
+    protected $implements = [];
+    protected $flags = 0;
+
+    protected $uses = [];
+    protected $constants = [];
+    protected $properties = [];
+    protected $methods = [];
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
 
     /**
      * Creates a class builder.
@@ -69,7 +67,7 @@ class Class_ extends Declaration {
      * @return $this The builder instance (for fluid interface)
      */
     public function makeAbstract() {
-        $this->flags = BuilderHelpers::addClassModifier($this->flags, Modifiers::ABSTRACT);
+        $this->flags = BuilderHelpers::addClassModifier($this->flags, Stmt\Class_::MODIFIER_ABSTRACT);
 
         return $this;
     }
@@ -80,18 +78,13 @@ class Class_ extends Declaration {
      * @return $this The builder instance (for fluid interface)
      */
     public function makeFinal() {
-        $this->flags = BuilderHelpers::addClassModifier($this->flags, Modifiers::FINAL);
+        $this->flags = BuilderHelpers::addClassModifier($this->flags, Stmt\Class_::MODIFIER_FINAL);
 
         return $this;
     }
 
-    /**
-     * Makes the class readonly.
-     *
-     * @return $this The builder instance (for fluid interface)
-     */
     public function makeReadonly() {
-        $this->flags = BuilderHelpers::addClassModifier($this->flags, Modifiers::READONLY);
+        $this->flags = BuilderHelpers::addClassModifier($this->flags, Stmt\Class_::MODIFIER_READONLY);
 
         return $this;
     }
@@ -106,18 +99,20 @@ class Class_ extends Declaration {
     public function addStmt($stmt) {
         $stmt = BuilderHelpers::normalizeNode($stmt);
 
-        if ($stmt instanceof Stmt\Property) {
-            $this->properties[] = $stmt;
-        } elseif ($stmt instanceof Stmt\ClassMethod) {
-            $this->methods[] = $stmt;
-        } elseif ($stmt instanceof Stmt\TraitUse) {
-            $this->uses[] = $stmt;
-        } elseif ($stmt instanceof Stmt\ClassConst) {
-            $this->constants[] = $stmt;
-        } else {
+        $targets = [
+            Stmt\TraitUse::class    => &$this->uses,
+            Stmt\ClassConst::class  => &$this->constants,
+            Stmt\Property::class    => &$this->properties,
+            Stmt\ClassMethod::class => &$this->methods,
+        ];
+
+        $class = \get_class($stmt);
+        if (!isset($targets[$class])) {
             throw new \LogicException(sprintf('Unexpected node of type "%s"', $stmt->getType()));
         }
 
+        $targets[$class][] = $stmt;
+
         return $this;
     }
 
@@ -139,7 +134,7 @@ class Class_ extends Declaration {
      *
      * @return Stmt\Class_ The built class node
      */
-    public function getNode(): PhpParser\Node {
+    public function getNode() : PhpParser\Node {
         return new Stmt\Class_($this->name, [
             'flags' => $this->flags,
             'extends' => $this->extends,

package/plugins/nikic/php-parser/lib/PhpParser/Builder/Declaration.php

@@ -5,23 +5,16 @@ namespace PhpParser\Builder;
 use PhpParser;
 use PhpParser\BuilderHelpers;
 
-abstract class Declaration implements PhpParser\Builder {
-    /** @var array<string, mixed> */
-    protected array $attributes = [];
+abstract class Declaration implements PhpParser\Builder
+{
+    protected $attributes = [];
 
-    /**
-     * Adds a statement.
-     *
-     * @param PhpParser\Node\Stmt|PhpParser\Builder $stmt The statement to add
-     *
-     * @return $this The builder instance (for fluid interface)
-     */
     abstract public function addStmt($stmt);
 
     /**
      * Adds multiple statements.
      *
-     * @param (PhpParser\Node\Stmt|PhpParser\Builder)[] $stmts The statements to add
+     * @param array $stmts The statements to add
      *
      * @return $this The builder instance (for fluid interface)
      */

package/plugins/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php

@@ -10,21 +10,19 @@ use PhpParser\Node;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt;
 
-class EnumCase implements PhpParser\Builder {
-    /** @var Identifier|string */
+class EnumCase implements PhpParser\Builder
+{
     protected $name;
-    /** @var ?Node\Expr */
-    protected ?Node\Expr $value = null;
-    /** @var array<string, mixed> */
-    protected array $attributes = [];
+    protected $value = null;
+    protected $attributes = [];
 
-    /** @var list<Node\AttributeGroup> */
-    protected array $attributeGroups = [];
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
 
     /**
      * Creates an enum case builder.
      *
-     * @param string|Identifier $name Name
+     * @param string|Identifier $name  Name
      */
     public function __construct($name) {
         $this->name = $name;

package/plugins/nikic/php-parser/lib/PhpParser/Builder/Enum_.php

@@ -9,21 +9,20 @@ use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt;
 
-class Enum_ extends Declaration {
-    protected string $name;
-    protected ?Identifier $scalarType = null;
-    /** @var list<Name> */
-    protected array $implements = [];
-    /** @var list<Stmt\TraitUse> */
-    protected array $uses = [];
-    /** @var list<Stmt\EnumCase> */
-    protected array $enumCases = [];
-    /** @var list<Stmt\ClassConst> */
-    protected array $constants = [];
-    /** @var list<Stmt\ClassMethod> */
-    protected array $methods = [];
-    /** @var list<Node\AttributeGroup> */
-    protected array $attributeGroups = [];
+class Enum_ extends Declaration
+{
+    protected $name;
+    protected $scalarType = null;
+
+    protected $implements = [];
+
+    protected $uses = [];
+    protected $enumCases = [];
+    protected $constants = [];
+    protected $methods = [];
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
 
     /**
      * Creates an enum builder.
@@ -37,7 +36,7 @@ class Enum_ extends Declaration {
     /**
      * Sets the scalar type.
      *
-     * @param string|Identifier $scalarType
+     * @param string|Identifier $type
      *
      * @return $this
      */
@@ -72,18 +71,20 @@ class Enum_ extends Declaration {
     public function addStmt($stmt) {
         $stmt = BuilderHelpers::normalizeNode($stmt);
 
-        if ($stmt instanceof Stmt\EnumCase) {
-            $this->enumCases[] = $stmt;
-        } elseif ($stmt instanceof Stmt\ClassMethod) {
-            $this->methods[] = $stmt;
-        } elseif ($stmt instanceof Stmt\TraitUse) {
-            $this->uses[] = $stmt;
-        } elseif ($stmt instanceof Stmt\ClassConst) {
-            $this->constants[] = $stmt;
-        } else {
+        $targets = [
+            Stmt\TraitUse::class    => &$this->uses,
+            Stmt\EnumCase::class    => &$this->enumCases,
+            Stmt\ClassConst::class  => &$this->constants,
+            Stmt\ClassMethod::class => &$this->methods,
+        ];
+
+        $class = \get_class($stmt);
+        if (!isset($targets[$class])) {
             throw new \LogicException(sprintf('Unexpected node of type "%s"', $stmt->getType()));
         }
 
+        $targets[$class][] = $stmt;
+
         return $this;
     }
 
@@ -105,7 +106,7 @@ class Enum_ extends Declaration {
      *
      * @return Stmt\Enum_ The built enum node
      */
-    public function getNode(): PhpParser\Node {
+    public function getNode() : PhpParser\Node {
         return new Stmt\Enum_($this->name, [
             'scalarType' => $this->scalarType,
             'implements' => $this->implements,

package/plugins/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php

@@ -5,13 +5,13 @@ namespace PhpParser\Builder;
 use PhpParser\BuilderHelpers;
 use PhpParser\Node;
 
-abstract class FunctionLike extends Declaration {
-    protected bool $returnByRef = false;
-    /** @var Node\Param[] */
-    protected array $params = [];
+abstract class FunctionLike extends Declaration
+{
+    protected $returnByRef = false;
+    protected $params = [];
 
-    /** @var Node\Identifier|Node\Name|Node\ComplexType|null */
-    protected ?Node $returnType = null;
+    /** @var string|Node\Name|Node\NullableType|null */
+    protected $returnType = null;
 
     /**
      * Make the function return by reference.
@@ -46,7 +46,7 @@ abstract class FunctionLike extends Declaration {
     /**
      * Adds multiple parameters.
      *
-     * @param (Node\Param|Param)[] $params The parameters to add
+     * @param array $params The parameters to add
      *
      * @return $this The builder instance (for fluid interface)
      */

package/plugins/nikic/php-parser/lib/PhpParser/Builder/Function_.php

@@ -7,13 +7,13 @@ use PhpParser\BuilderHelpers;
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
 
-class Function_ extends FunctionLike {
-    protected string $name;
-    /** @var list<Stmt> */
-    protected array $stmts = [];
+class Function_ extends FunctionLike
+{
+    protected $name;
+    protected $stmts = [];
 
-    /** @var list<Node\AttributeGroup> */
-    protected array $attributeGroups = [];
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
 
     /**
      * Creates a function builder.
@@ -55,7 +55,7 @@ class Function_ extends FunctionLike {
      *
      * @return Stmt\Function_ The built function node
      */
-    public function getNode(): Node {
+    public function getNode() : Node {
         return new Stmt\Function_($this->name, [
             'byRef'      => $this->returnByRef,
             'params'     => $this->params,

package/plugins/nikic/php-parser/lib/PhpParser/Builder/Interface_.php

@@ -8,16 +8,15 @@ use PhpParser\Node;
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt;
 
-class Interface_ extends Declaration {
-    protected string $name;
-    /** @var list<Name> */
-    protected array $extends = [];
-    /** @var list<Stmt\ClassConst> */
-    protected array $constants = [];
-    /** @var list<Stmt\ClassMethod> */
-    protected array $methods = [];
-    /** @var list<Node\AttributeGroup> */
-    protected array $attributeGroups = [];
+class Interface_ extends Declaration
+{
+    protected $name;
+    protected $extends = [];
+    protected $constants = [];
+    protected $methods = [];
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
 
     /**
      * Creates an interface builder.
@@ -84,7 +83,7 @@ class Interface_ extends Declaration {
      *
      * @return Stmt\Interface_ The built interface node
      */
-    public function getNode(): PhpParser\Node {
+    public function getNode() : PhpParser\Node {
         return new Stmt\Interface_($this->name, [
             'extends' => $this->extends,
             'stmts' => array_merge($this->constants, $this->methods),