@appthreat/atom 1.8.1 → 1.8.2

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

@@ -2,76 +2,84 @@
 
 namespace PhpParser\Node\Stmt;
 
-use PhpParser\Modifiers;
 use PhpParser\Node;
 
-class ClassConst extends Node\Stmt {
+class ClassConst extends Node\Stmt
+{
     /** @var int Modifiers */
-    public int $flags;
+    public $flags;
     /** @var Node\Const_[] Constant declarations */
-    public array $consts;
+    public $consts;
     /** @var Node\AttributeGroup[] PHP attribute groups */
-    public array $attrGroups;
+    public $attrGroups;
     /** @var Node\Identifier|Node\Name|Node\ComplexType|null Type declaration */
-    public ?Node $type;
+    public $type;
 
     /**
      * Constructs a class const list node.
      *
-     * @param Node\Const_[] $consts Constant declarations
-     * @param int $flags Modifiers
-     * @param array<string, mixed> $attributes Additional attributes
-     * @param list<Node\AttributeGroup> $attrGroups PHP attribute groups
-     * @param null|Node\Identifier|Node\Name|Node\ComplexType $type Type declaration
+     * @param Node\Const_[]                                          $consts     Constant declarations
+     * @param int                                                    $flags      Modifiers
+     * @param array                                                  $attributes Additional attributes
+     * @param Node\AttributeGroup[]                                  $attrGroups PHP attribute groups
+     * @param null|string|Node\Identifier|Node\Name|Node\ComplexType $type       Type declaration
      */
     public function __construct(
         array $consts,
         int $flags = 0,
         array $attributes = [],
         array $attrGroups = [],
-        ?Node $type = null
+        $type = null
     ) {
         $this->attributes = $attributes;
         $this->flags = $flags;
         $this->consts = $consts;
         $this->attrGroups = $attrGroups;
-        $this->type = $type;
+        $this->type = \is_string($type) ? new Node\Identifier($type) : $type;
     }
 
-    public function getSubNodeNames(): array {
+    public function getSubNodeNames() : array {
         return ['attrGroups', 'flags', 'type', 'consts'];
     }
 
     /**
      * Whether constant is explicitly or implicitly public.
+     *
+     * @return bool
      */
-    public function isPublic(): bool {
-        return ($this->flags & Modifiers::PUBLIC) !== 0
-            || ($this->flags & Modifiers::VISIBILITY_MASK) === 0;
+    public function isPublic() : bool {
+        return ($this->flags & Class_::MODIFIER_PUBLIC) !== 0
+            || ($this->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0;
     }
 
     /**
      * Whether constant is protected.
+     *
+     * @return bool
      */
-    public function isProtected(): bool {
-        return (bool) ($this->flags & Modifiers::PROTECTED);
+    public function isProtected() : bool {
+        return (bool) ($this->flags & Class_::MODIFIER_PROTECTED);
     }
 
     /**
      * Whether constant is private.
+     *
+     * @return bool
      */
-    public function isPrivate(): bool {
-        return (bool) ($this->flags & Modifiers::PRIVATE);
+    public function isPrivate() : bool {
+        return (bool) ($this->flags & Class_::MODIFIER_PRIVATE);
     }
 
     /**
      * Whether constant is final.
+     *
+     * @return bool
      */
-    public function isFinal(): bool {
-        return (bool) ($this->flags & Modifiers::FINAL);
+    public function isFinal() : bool {
+        return (bool) ($this->flags & Class_::MODIFIER_FINAL);
     }
 
-    public function getType(): string {
+    public function getType() : string {
         return 'Stmt_ClassConst';
     }
 }

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

@@ -3,23 +3,23 @@
 namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
-use PhpParser\Node\PropertyItem;
 
-abstract class ClassLike extends Node\Stmt {
+abstract class ClassLike extends Node\Stmt
+{
     /** @var Node\Identifier|null Name */
-    public ?Node\Identifier $name;
+    public $name;
     /** @var Node\Stmt[] Statements */
-    public array $stmts;
+    public $stmts;
     /** @var Node\AttributeGroup[] PHP attribute groups */
-    public array $attrGroups;
+    public $attrGroups;
 
     /** @var Node\Name|null Namespaced name (if using NameResolver) */
-    public ?Node\Name $namespacedName;
+    public $namespacedName;
 
     /**
      * @return TraitUse[]
      */
-    public function getTraitUses(): array {
+    public function getTraitUses() : array {
         $traitUses = [];
         foreach ($this->stmts as $stmt) {
             if ($stmt instanceof TraitUse) {
@@ -32,7 +32,7 @@ abstract class ClassLike extends Node\Stmt {
     /**
      * @return ClassConst[]
      */
-    public function getConstants(): array {
+    public function getConstants() : array {
         $constants = [];
         foreach ($this->stmts as $stmt) {
             if ($stmt instanceof ClassConst) {
@@ -45,7 +45,7 @@ abstract class ClassLike extends Node\Stmt {
     /**
      * @return Property[]
      */
-    public function getProperties(): array {
+    public function getProperties() : array {
         $properties = [];
         foreach ($this->stmts as $stmt) {
             if ($stmt instanceof Property) {
@@ -62,11 +62,11 @@ abstract class ClassLike extends Node\Stmt {
      *
      * @return Property|null Property node or null if the property does not exist
      */
-    public function getProperty(string $name): ?Property {
+    public function getProperty(string $name) {
         foreach ($this->stmts as $stmt) {
             if ($stmt instanceof Property) {
                 foreach ($stmt->props as $prop) {
-                    if ($prop instanceof PropertyItem && $name === $prop->name->toString()) {
+                    if ($prop instanceof PropertyProperty && $name === $prop->name->toString()) {
                         return $stmt;
                     }
                 }
@@ -80,7 +80,7 @@ abstract class ClassLike extends Node\Stmt {
      *
      * @return ClassMethod[]
      */
-    public function getMethods(): array {
+    public function getMethods() : array {
         $methods = [];
         foreach ($this->stmts as $stmt) {
             if ($stmt instanceof ClassMethod) {
@@ -97,7 +97,7 @@ abstract class ClassLike extends Node\Stmt {
      *
      * @return ClassMethod|null Method node or null if the method does not exist
      */
-    public function getMethod(string $name): ?ClassMethod {
+    public function getMethod(string $name) {
         $lowerName = strtolower($name);
         foreach ($this->stmts as $stmt) {
             if ($stmt instanceof ClassMethod && $lowerName === $stmt->name->toLowerString()) {

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

@@ -2,28 +2,27 @@
 
 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 int $flags;
+    public $flags;
     /** @var bool Whether to return by reference */
-    public bool $byRef;
+    public $byRef;
     /** @var Node\Identifier Name */
-    public Node\Identifier $name;
+    public $name;
     /** @var Node\Param[] Parameters */
-    public array $params;
+    public $params;
     /** @var null|Node\Identifier|Node\Name|Node\ComplexType Return type */
-    public ?Node $returnType;
+    public $returnType;
     /** @var Node\Stmt[]|null Statements */
-    public ?array $stmts;
+    public $stmts;
     /** @var Node\AttributeGroup[] PHP attribute groups */
-    public array $attrGroups;
+    public $attrGroups;
 
-    /** @var array<string, bool> */
-    private static array $magicNames = [
+    private static $magicNames = [
         '__construct'   => true,
         '__destruct'    => true,
         '__call'        => true,
@@ -47,21 +46,14 @@ class ClassMethod extends Node\Stmt implements FunctionLike {
      * Constructs a class method node.
      *
      * @param string|Node\Identifier $name Name
-     * @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
+     * @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
      */
     public function __construct($name, array $subNodes = [], array $attributes = []) {
         $this->attributes = $attributes;
@@ -69,20 +61,21 @@ 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'] ?? [];
-        $this->returnType = $subNodes['returnType'] ?? null;
+        $returnType = $subNodes['returnType'] ?? null;
+        $this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType;
         $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;
     }
 
@@ -90,65 +83,79 @@ class ClassMethod extends Node\Stmt implements FunctionLike {
         return $this->returnType;
     }
 
-    public function getStmts(): ?array {
+    public function getStmts() {
         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 & Modifiers::PUBLIC) !== 0
-            || ($this->flags & Modifiers::VISIBILITY_MASK) === 0;
+    public function isPublic() : bool {
+        return ($this->flags & Class_::MODIFIER_PUBLIC) !== 0
+            || ($this->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0;
     }
 
     /**
      * Whether the method is protected.
+     *
+     * @return bool
      */
-    public function isProtected(): bool {
-        return (bool) ($this->flags & Modifiers::PROTECTED);
+    public function isProtected() : bool {
+        return (bool) ($this->flags & Class_::MODIFIER_PROTECTED);
     }
 
     /**
      * Whether the method is private.
+     *
+     * @return bool
      */
-    public function isPrivate(): bool {
-        return (bool) ($this->flags & Modifiers::PRIVATE);
+    public function isPrivate() : bool {
+        return (bool) ($this->flags & Class_::MODIFIER_PRIVATE);
     }
 
     /**
      * Whether the method is abstract.
+     *
+     * @return bool
      */
-    public function isAbstract(): bool {
-        return (bool) ($this->flags & Modifiers::ABSTRACT);
+    public function isAbstract() : bool {
+        return (bool) ($this->flags & Class_::MODIFIER_ABSTRACT);
     }
 
     /**
      * Whether the method is final.
+     *
+     * @return bool
      */
-    public function isFinal(): bool {
-        return (bool) ($this->flags & Modifiers::FINAL);
+    public function isFinal() : bool {
+        return (bool) ($this->flags & Class_::MODIFIER_FINAL);
     }
 
     /**
      * Whether the method is static.
+     *
+     * @return bool
      */
-    public function isStatic(): bool {
-        return (bool) ($this->flags & Modifiers::STATIC);
+    public function isStatic() : bool {
+        return (bool) ($this->flags & Class_::MODIFIER_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,52 +2,39 @@
 
 namespace PhpParser\Node\Stmt;
 
-use PhpParser\Modifiers;
+use PhpParser\Error;
 use PhpParser\Node;
 
-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;
+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;
     /** @var null|Node\Name Name of extended class */
-    public ?Node\Name $extends;
+    public $extends;
     /** @var Node\Name[] Names of implemented interfaces */
-    public array $implements;
+    public $implements;
 
     /**
      * Constructs a class node.
      *
      * @param string|Node\Identifier|null $name Name
-     * @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
+     * @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
      */
     public function __construct($name, array $subNodes = [], array $attributes = []) {
         $this->attributes = $attributes;
@@ -59,36 +46,92 @@ 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 & Modifiers::ABSTRACT);
+    public function isAbstract() : bool {
+        return (bool) ($this->flags & self::MODIFIER_ABSTRACT);
     }
 
     /**
      * Whether the class is final.
+     *
+     * @return bool
      */
-    public function isFinal(): bool {
-        return (bool) ($this->flags & Modifiers::FINAL);
+    public function isFinal() : bool {
+        return (bool) ($this->flags & self::MODIFIER_FINAL);
     }
 
-    public function isReadonly(): bool {
-        return (bool) ($this->flags & Modifiers::READONLY);
+    public function isReadonly() : bool {
+        return (bool) ($this->flags & self::MODIFIER_READONLY);
     }
 
     /**
      * Whether the class is anonymous.
+     *
+     * @return bool
      */
-    public function isAnonymous(): bool {
+    public function isAnonymous() : bool {
         return null === $this->name;
     }
 
-    public function getType(): string {
+    /**
+     * @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 {
         return 'Stmt_Class';
     }
 }

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

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

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

@@ -4,26 +4,27 @@ 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 ?Node\Expr $num;
+    public $num;
 
     /**
      * Constructs a continue node.
      *
-     * @param null|Node\Expr $num Number of loops to continue
-     * @param array<string, mixed> $attributes Additional attributes
+     * @param null|Node\Expr $num        Number of loops to continue
+     * @param array          $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

@@ -1,3 +1,34 @@
 <?php declare(strict_types=1);
 
-require __DIR__ . '/../DeclareItem.php';
+namespace PhpParser\Node\Stmt;
+
+use PhpParser\Node;
+
+class DeclareDeclare extends Node\Stmt
+{
+    /** @var Node\Identifier Key */
+    public $key;
+    /** @var Node\Expr Value */
+    public $value;
+
+    /**
+     * 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';
+    }
+}