@appthreat/atom-parsetools 1.0.3 → 1.0.5

package/plugins/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php

@@ -2,27 +2,28 @@
 
 namespace PhpParser\Node\Stmt;
 
+use PhpParser\Modifiers;
 use PhpParser\Node;
 use PhpParser\Node\FunctionLike;
 
-class ClassMethod extends Node\Stmt implements FunctionLike
-{
+class ClassMethod extends Node\Stmt implements FunctionLike {
     /** @var int Flags */
-    public $flags;
+    public int $flags;
     /** @var bool Whether to return by reference */
-    public $byRef;
+    public bool $byRef;
     /** @var Node\Identifier Name */
-    public $name;
+    public Node\Identifier $name;
     /** @var Node\Param[] Parameters */
-    public $params;
+    public array $params;
     /** @var null|Node\Identifier|Node\Name|Node\ComplexType Return type */
-    public $returnType;
+    public ?Node $returnType;
     /** @var Node\Stmt[]|null Statements */
-    public $stmts;
+    public ?array $stmts;
     /** @var Node\AttributeGroup[] PHP attribute groups */
-    public $attrGroups;
+    public array $attrGroups;
 
-    private static $magicNames = [
+    /** @var array<string, bool> */
+    private static array $magicNames = [
         '__construct'   => true,
         '__destruct'    => true,
         '__call'        => true,
@@ -46,14 +47,21 @@ class ClassMethod extends Node\Stmt implements FunctionLike
      * Constructs a class method node.
      *
      * @param string|Node\Identifier $name Name
-     * @param array $subNodes   Array of the following optional subnodes:
-     *                          'flags       => MODIFIER_PUBLIC: Flags
-     *                          'byRef'      => false          : Whether to return by reference
-     *                          'params'     => array()        : Parameters
-     *                          'returnType' => null           : Return type
-     *                          'stmts'      => array()        : Statements
-     *                          'attrGroups' => array()        : PHP attribute groups
-     * @param array $attributes Additional attributes
+     * @param array{
+     *     flags?: int,
+     *     byRef?: bool,
+     *     params?: Node\Param[],
+     *     returnType?: null|Node\Identifier|Node\Name|Node\ComplexType,
+     *     stmts?: Node\Stmt[]|null,
+     *     attrGroups?: Node\AttributeGroup[],
+     * } $subNodes Array of the following optional subnodes:
+     *             'flags       => 0              : Flags
+     *             'byRef'      => false          : Whether to return by reference
+     *             'params'     => array()        : Parameters
+     *             'returnType' => null           : Return type
+     *             'stmts'      => array()        : Statements
+     *             'attrGroups' => array()        : PHP attribute groups
+     * @param array<string, mixed> $attributes Additional attributes
      */
     public function __construct($name, array $subNodes = [], array $attributes = []) {
         $this->attributes = $attributes;
@@ -61,21 +69,20 @@ class ClassMethod extends Node\Stmt implements FunctionLike
         $this->byRef = $subNodes['byRef'] ?? false;
         $this->name = \is_string($name) ? new Node\Identifier($name) : $name;
         $this->params = $subNodes['params'] ?? [];
-        $returnType = $subNodes['returnType'] ?? null;
-        $this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType;
+        $this->returnType = $subNodes['returnType'] ?? null;
         $this->stmts = array_key_exists('stmts', $subNodes) ? $subNodes['stmts'] : [];
         $this->attrGroups = $subNodes['attrGroups'] ?? [];
     }
 
-    public function getSubNodeNames() : array {
+    public function getSubNodeNames(): array {
         return ['attrGroups', 'flags', 'byRef', 'name', 'params', 'returnType', 'stmts'];
     }
 
-    public function returnsByRef() : bool {
+    public function returnsByRef(): bool {
         return $this->byRef;
     }
 
-    public function getParams() : array {
+    public function getParams(): array {
         return $this->params;
     }
 
@@ -83,79 +90,65 @@ class ClassMethod extends Node\Stmt implements FunctionLike
         return $this->returnType;
     }
 
-    public function getStmts() {
+    public function getStmts(): ?array {
         return $this->stmts;
     }
 
-    public function getAttrGroups() : array {
+    public function getAttrGroups(): array {
         return $this->attrGroups;
     }
 
     /**
      * Whether the method is explicitly or implicitly public.
-     *
-     * @return bool
      */
-    public function isPublic() : bool {
-        return ($this->flags & Class_::MODIFIER_PUBLIC) !== 0
-            || ($this->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0;
+    public function isPublic(): bool {
+        return ($this->flags & Modifiers::PUBLIC) !== 0
+            || ($this->flags & Modifiers::VISIBILITY_MASK) === 0;
     }
 
     /**
      * Whether the method is protected.
-     *
-     * @return bool
      */
-    public function isProtected() : bool {
-        return (bool) ($this->flags & Class_::MODIFIER_PROTECTED);
+    public function isProtected(): bool {
+        return (bool) ($this->flags & Modifiers::PROTECTED);
     }
 
     /**
      * Whether the method is private.
-     *
-     * @return bool
      */
-    public function isPrivate() : bool {
-        return (bool) ($this->flags & Class_::MODIFIER_PRIVATE);
+    public function isPrivate(): bool {
+        return (bool) ($this->flags & Modifiers::PRIVATE);
     }
 
     /**
      * Whether the method is abstract.
-     *
-     * @return bool
      */
-    public function isAbstract() : bool {
-        return (bool) ($this->flags & Class_::MODIFIER_ABSTRACT);
+    public function isAbstract(): bool {
+        return (bool) ($this->flags & Modifiers::ABSTRACT);
     }
 
     /**
      * Whether the method is final.
-     *
-     * @return bool
      */
-    public function isFinal() : bool {
-        return (bool) ($this->flags & Class_::MODIFIER_FINAL);
+    public function isFinal(): bool {
+        return (bool) ($this->flags & Modifiers::FINAL);
     }
 
     /**
      * Whether the method is static.
-     *
-     * @return bool
      */
-    public function isStatic() : bool {
-        return (bool) ($this->flags & Class_::MODIFIER_STATIC);
+    public function isStatic(): bool {
+        return (bool) ($this->flags & Modifiers::STATIC);
     }
 
     /**
      * Whether the method is magic.
-     *
-     * @return bool
      */
-    public function isMagic() : bool {
+    public function isMagic(): bool {
         return isset(self::$magicNames[$this->name->toLowerString()]);
     }
 
-    public function getType() : string {
+    public function getType(): string {
         return 'Stmt_ClassMethod';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php

@@ -2,39 +2,52 @@
 
 namespace PhpParser\Node\Stmt;
 
-use PhpParser\Error;
+use PhpParser\Modifiers;
 use PhpParser\Node;
 
-class Class_ extends ClassLike
-{
-    const MODIFIER_PUBLIC    =  1;
-    const MODIFIER_PROTECTED =  2;
-    const MODIFIER_PRIVATE   =  4;
-    const MODIFIER_STATIC    =  8;
-    const MODIFIER_ABSTRACT  = 16;
-    const MODIFIER_FINAL     = 32;
-    const MODIFIER_READONLY  = 64;
-
-    const VISIBILITY_MODIFIER_MASK = 7; // 1 | 2 | 4
-
-    /** @var int Type */
-    public $flags;
+class Class_ extends ClassLike {
+    /** @deprecated Use Modifiers::PUBLIC instead */
+    public const MODIFIER_PUBLIC    =  1;
+    /** @deprecated Use Modifiers::PROTECTED instead */
+    public const MODIFIER_PROTECTED =  2;
+    /** @deprecated Use Modifiers::PRIVATE instead */
+    public const MODIFIER_PRIVATE   =  4;
+    /** @deprecated Use Modifiers::STATIC instead */
+    public const MODIFIER_STATIC    =  8;
+    /** @deprecated Use Modifiers::ABSTRACT instead */
+    public const MODIFIER_ABSTRACT  = 16;
+    /** @deprecated Use Modifiers::FINAL instead */
+    public const MODIFIER_FINAL     = 32;
+    /** @deprecated Use Modifiers::READONLY instead */
+    public const MODIFIER_READONLY  = 64;
+
+    /** @deprecated Use Modifiers::VISIBILITY_MASK instead */
+    public const VISIBILITY_MODIFIER_MASK = 7; // 1 | 2 | 4
+
+    /** @var int Modifiers */
+    public int $flags;
     /** @var null|Node\Name Name of extended class */
-    public $extends;
+    public ?Node\Name $extends;
     /** @var Node\Name[] Names of implemented interfaces */
-    public $implements;
+    public array $implements;
 
     /**
      * Constructs a class node.
      *
      * @param string|Node\Identifier|null $name Name
-     * @param array       $subNodes   Array of the following optional subnodes:
-     *                                'flags'       => 0      : Flags
-     *                                'extends'     => null   : Name of extended class
-     *                                'implements'  => array(): Names of implemented interfaces
-     *                                'stmts'       => array(): Statements
-     *                                'attrGroups'  => array(): PHP attribute groups
-     * @param array       $attributes Additional attributes
+     * @param array{
+     *     flags?: int,
+     *     extends?: Node\Name|null,
+     *     implements?: Node\Name[],
+     *     stmts?: Node\Stmt[],
+     *     attrGroups?: Node\AttributeGroup[],
+     * } $subNodes Array of the following optional subnodes:
+     *             'flags'       => 0      : Flags
+     *             'extends'     => null   : Name of extended class
+     *             'implements'  => array(): Names of implemented interfaces
+     *             'stmts'       => array(): Statements
+     *             'attrGroups'  => array(): PHP attribute groups
+     * @param array<string, mixed> $attributes Additional attributes
      */
     public function __construct($name, array $subNodes = [], array $attributes = []) {
         $this->attributes = $attributes;
@@ -46,92 +59,36 @@ class Class_ extends ClassLike
         $this->attrGroups = $subNodes['attrGroups'] ?? [];
     }
 
-    public function getSubNodeNames() : array {
+    public function getSubNodeNames(): array {
         return ['attrGroups', 'flags', 'name', 'extends', 'implements', 'stmts'];
     }
 
     /**
      * Whether the class is explicitly abstract.
-     *
-     * @return bool
      */
-    public function isAbstract() : bool {
-        return (bool) ($this->flags & self::MODIFIER_ABSTRACT);
+    public function isAbstract(): bool {
+        return (bool) ($this->flags & Modifiers::ABSTRACT);
     }
 
     /**
      * Whether the class is final.
-     *
-     * @return bool
      */
-    public function isFinal() : bool {
-        return (bool) ($this->flags & self::MODIFIER_FINAL);
+    public function isFinal(): bool {
+        return (bool) ($this->flags & Modifiers::FINAL);
     }
 
-    public function isReadonly() : bool {
-        return (bool) ($this->flags & self::MODIFIER_READONLY);
+    public function isReadonly(): bool {
+        return (bool) ($this->flags & Modifiers::READONLY);
     }
 
     /**
      * Whether the class is anonymous.
-     *
-     * @return bool
      */
-    public function isAnonymous() : bool {
+    public function isAnonymous(): bool {
         return null === $this->name;
     }
 
-    /**
-     * @internal
-     */
-    public static function verifyClassModifier($a, $b) {
-        if ($a & self::MODIFIER_ABSTRACT && $b & self::MODIFIER_ABSTRACT) {
-            throw new Error('Multiple abstract modifiers are not allowed');
-        }
-
-        if ($a & self::MODIFIER_FINAL && $b & self::MODIFIER_FINAL) {
-            throw new Error('Multiple final modifiers are not allowed');
-        }
-
-        if ($a & self::MODIFIER_READONLY && $b & self::MODIFIER_READONLY) {
-            throw new Error('Multiple readonly modifiers are not allowed');
-        }
-
-        if ($a & 48 && $b & 48) {
-            throw new Error('Cannot use the final modifier on an abstract class');
-        }
-    }
-
-    /**
-     * @internal
-     */
-    public static function verifyModifier($a, $b) {
-        if ($a & self::VISIBILITY_MODIFIER_MASK && $b & self::VISIBILITY_MODIFIER_MASK) {
-            throw new Error('Multiple access type modifiers are not allowed');
-        }
-
-        if ($a & self::MODIFIER_ABSTRACT && $b & self::MODIFIER_ABSTRACT) {
-            throw new Error('Multiple abstract modifiers are not allowed');
-        }
-
-        if ($a & self::MODIFIER_STATIC && $b & self::MODIFIER_STATIC) {
-            throw new Error('Multiple static modifiers are not allowed');
-        }
-
-        if ($a & self::MODIFIER_FINAL && $b & self::MODIFIER_FINAL) {
-            throw new Error('Multiple final modifiers are not allowed');
-        }
-
-        if ($a & self::MODIFIER_READONLY && $b & self::MODIFIER_READONLY) {
-            throw new Error('Multiple readonly modifiers are not allowed');
-        }
-
-        if ($a & 48 && $b & 48) {
-            throw new Error('Cannot use the final modifier on an abstract class member');
-        }
-    }
-
-    public function getType() : string {
+    public function getType(): string {
         return 'Stmt_Class';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php

@@ -4,27 +4,34 @@ namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-class Const_ extends Node\Stmt
-{
+class Const_ extends Node\Stmt {
     /** @var Node\Const_[] Constant declarations */
-    public $consts;
+    public array $consts;
+    /** @var Node\AttributeGroup[] PHP attribute groups */
+    public array $attrGroups;
 
     /**
      * Constructs a const list node.
      *
-     * @param Node\Const_[] $consts     Constant declarations
-     * @param array         $attributes Additional attributes
+     * @param Node\Const_[] $consts Constant declarations
+     * @param array<string, mixed> $attributes Additional attributes
+     * @param list<Node\AttributeGroup> $attrGroups PHP attribute groups
      */
-    public function __construct(array $consts, array $attributes = []) {
+    public function __construct(
+        array $consts,
+        array $attributes = [],
+        array $attrGroups = []
+    ) {
         $this->attributes = $attributes;
+        $this->attrGroups = $attrGroups;
         $this->consts = $consts;
     }
 
-    public function getSubNodeNames() : array {
-        return ['consts'];
+    public function getSubNodeNames(): array {
+        return ['attrGroups', 'consts'];
     }
-    
-    public function getType() : string {
+
+    public function getType(): string {
         return 'Stmt_Const';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php

@@ -4,27 +4,26 @@ namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-class Continue_ extends Node\Stmt
-{
+class Continue_ extends Node\Stmt {
     /** @var null|Node\Expr Number of loops to continue */
-    public $num;
+    public ?Node\Expr $num;
 
     /**
      * Constructs a continue node.
      *
-     * @param null|Node\Expr $num        Number of loops to continue
-     * @param array          $attributes Additional attributes
+     * @param null|Node\Expr $num Number of loops to continue
+     * @param array<string, mixed> $attributes Additional attributes
      */
-    public function __construct(Node\Expr $num = null, array $attributes = []) {
+    public function __construct(?Node\Expr $num = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->num = $num;
     }
 
-    public function getSubNodeNames() : array {
+    public function getSubNodeNames(): array {
         return ['num'];
     }
-    
-    public function getType() : string {
+
+    public function getType(): string {
         return 'Stmt_Continue';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php

@@ -2,33 +2,12 @@
 
 namespace PhpParser\Node\Stmt;
 
-use PhpParser\Node;
+use PhpParser\Node\DeclareItem;
 
-class DeclareDeclare extends Node\Stmt
-{
-    /** @var Node\Identifier Key */
-    public $key;
-    /** @var Node\Expr Value */
-    public $value;
+require __DIR__ . '/../DeclareItem.php';
 
-    /**
-     * Constructs a declare key=>value pair node.
-     *
-     * @param string|Node\Identifier $key        Key
-     * @param Node\Expr              $value      Value
-     * @param array                  $attributes Additional attributes
-     */
-    public function __construct($key, Node\Expr $value, array $attributes = []) {
-        $this->attributes = $attributes;
-        $this->key = \is_string($key) ? new Node\Identifier($key) : $key;
-        $this->value = $value;
-    }
-
-    public function getSubNodeNames() : array {
-        return ['key', 'value'];
-    }
-    
-    public function getType() : string {
-        return 'Stmt_DeclareDeclare';
+if (false) {
+    // For classmap-authoritative support.
+    class DeclareDeclare extends DeclareItem {
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php

@@ -3,32 +3,32 @@
 namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
+use PhpParser\Node\DeclareItem;
 
-class Declare_ extends Node\Stmt
-{
-    /** @var DeclareDeclare[] List of declares */
-    public $declares;
+class Declare_ extends Node\Stmt {
+    /** @var DeclareItem[] List of declares */
+    public array $declares;
     /** @var Node\Stmt[]|null Statements */
-    public $stmts;
+    public ?array $stmts;
 
     /**
      * Constructs a declare node.
      *
-     * @param DeclareDeclare[] $declares   List of declares
-     * @param Node\Stmt[]|null $stmts      Statements
-     * @param array            $attributes Additional attributes
+     * @param DeclareItem[] $declares List of declares
+     * @param Node\Stmt[]|null $stmts Statements
+     * @param array<string, mixed> $attributes Additional attributes
      */
-    public function __construct(array $declares, array $stmts = null, array $attributes = []) {
+    public function __construct(array $declares, ?array $stmts = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->declares = $declares;
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() : array {
+    public function getSubNodeNames(): array {
         return ['declares', 'stmts'];
     }
-    
-    public function getType() : string {
+
+    public function getType(): string {
         return 'Stmt_Declare';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php

@@ -4,19 +4,18 @@ namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-class Do_ extends Node\Stmt
-{
+class Do_ extends Node\Stmt {
     /** @var Node\Stmt[] Statements */
-    public $stmts;
+    public array $stmts;
     /** @var Node\Expr Condition */
-    public $cond;
+    public Node\Expr $cond;
 
     /**
      * Constructs a do while node.
      *
-     * @param Node\Expr   $cond       Condition
-     * @param Node\Stmt[] $stmts      Statements
-     * @param array       $attributes Additional attributes
+     * @param Node\Expr $cond Condition
+     * @param Node\Stmt[] $stmts Statements
+     * @param array<string, mixed> $attributes Additional attributes
      */
     public function __construct(Node\Expr $cond, array $stmts = [], array $attributes = []) {
         $this->attributes = $attributes;
@@ -24,11 +23,11 @@ class Do_ extends Node\Stmt
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() : array {
+    public function getSubNodeNames(): array {
         return ['stmts', 'cond'];
     }
-    
-    public function getType() : string {
+
+    public function getType(): string {
         return 'Stmt_Do';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php

@@ -4,27 +4,26 @@ namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-class Echo_ extends Node\Stmt
-{
+class Echo_ extends Node\Stmt {
     /** @var Node\Expr[] Expressions */
-    public $exprs;
+    public array $exprs;
 
     /**
      * Constructs an echo node.
      *
-     * @param Node\Expr[] $exprs      Expressions
-     * @param array       $attributes Additional attributes
+     * @param Node\Expr[] $exprs Expressions
+     * @param array<string, mixed> $attributes Additional attributes
      */
     public function __construct(array $exprs, array $attributes = []) {
         $this->attributes = $attributes;
         $this->exprs = $exprs;
     }
 
-    public function getSubNodeNames() : array {
+    public function getSubNodeNames(): array {
         return ['exprs'];
     }
-    
-    public function getType() : string {
+
+    public function getType(): string {
         return 'Stmt_Echo';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php

@@ -4,19 +4,18 @@ namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-class ElseIf_ extends Node\Stmt
-{
+class ElseIf_ extends Node\Stmt {
     /** @var Node\Expr Condition */
-    public $cond;
+    public Node\Expr $cond;
     /** @var Node\Stmt[] Statements */
-    public $stmts;
+    public array $stmts;
 
     /**
      * Constructs an elseif node.
      *
-     * @param Node\Expr   $cond       Condition
-     * @param Node\Stmt[] $stmts      Statements
-     * @param array       $attributes Additional attributes
+     * @param Node\Expr $cond Condition
+     * @param Node\Stmt[] $stmts Statements
+     * @param array<string, mixed> $attributes Additional attributes
      */
     public function __construct(Node\Expr $cond, array $stmts = [], array $attributes = []) {
         $this->attributes = $attributes;
@@ -24,11 +23,11 @@ class ElseIf_ extends Node\Stmt
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() : array {
+    public function getSubNodeNames(): array {
         return ['cond', 'stmts'];
     }
-    
-    public function getType() : string {
+
+    public function getType(): string {
         return 'Stmt_ElseIf';
     }
 }