@appthreat/atom-parsetools 1.0.3 → 1.0.5

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

@@ -4,10 +4,9 @@ namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-abstract class TraitUseAdaptation extends Node\Stmt
-{
+abstract class TraitUseAdaptation extends Node\Stmt {
     /** @var Node\Name|null Trait name */
-    public $trait;
+    public ?Node\Name $trait;
     /** @var Node\Identifier Method name */
-    public $method;
+    public Node\Identifier $method;
 }

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

@@ -4,16 +4,18 @@ namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-class Trait_ extends ClassLike
-{
+class Trait_ extends ClassLike {
     /**
      * Constructs a trait node.
      *
      * @param string|Node\Identifier $name Name
-     * @param array  $subNodes   Array of the following optional subnodes:
-     *                           'stmts'      => array(): Statements
-     *                           'attrGroups' => array(): PHP attribute groups
-     * @param array  $attributes Additional attributes
+     * @param array{
+     *     stmts?: Node\Stmt[],
+     *     attrGroups?: Node\AttributeGroup[],
+     * } $subNodes Array of the following optional subnodes:
+     *             '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;
@@ -22,11 +24,11 @@ class Trait_ extends ClassLike
         $this->attrGroups = $subNodes['attrGroups'] ?? [];
     }
 
-    public function getSubNodeNames() : array {
+    public function getSubNodeNames(): array {
         return ['attrGroups', 'name', 'stmts'];
     }
 
-    public function getType() : string {
+    public function getType(): string {
         return 'Stmt_Trait';
     }
 }

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

@@ -4,35 +4,34 @@ namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-class TryCatch extends Node\Stmt
-{
+class TryCatch extends Node\Stmt {
     /** @var Node\Stmt[] Statements */
-    public $stmts;
+    public array $stmts;
     /** @var Catch_[] Catches */
-    public $catches;
+    public array $catches;
     /** @var null|Finally_ Optional finally node */
-    public $finally;
+    public ?Finally_ $finally;
 
     /**
      * Constructs a try catch node.
      *
-     * @param Node\Stmt[]   $stmts      Statements
-     * @param Catch_[]      $catches    Catches
-     * @param null|Finally_ $finally    Optional finally node
-     * @param array         $attributes Additional attributes
+     * @param Node\Stmt[] $stmts Statements
+     * @param Catch_[] $catches Catches
+     * @param null|Finally_ $finally Optional finally node
+     * @param array<string, mixed> $attributes Additional attributes
      */
-    public function __construct(array $stmts, array $catches, Finally_ $finally = null, array $attributes = []) {
+    public function __construct(array $stmts, array $catches, ?Finally_ $finally = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->stmts = $stmts;
         $this->catches = $catches;
         $this->finally = $finally;
     }
 
-    public function getSubNodeNames() : array {
+    public function getSubNodeNames(): array {
         return ['stmts', 'catches', 'finally'];
     }
 
-    public function getType() : string {
+    public function getType(): string {
         return 'Stmt_TryCatch';
     }
 }

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

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

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

@@ -2,51 +2,12 @@
 
 namespace PhpParser\Node\Stmt;
 
-use PhpParser\Node;
-use PhpParser\Node\Identifier;
+use PhpParser\Node\UseItem;
 
-class UseUse extends Node\Stmt
-{
-    /** @var int One of the Stmt\Use_::TYPE_* constants. Will only differ from TYPE_UNKNOWN for mixed group uses */
-    public $type;
-    /** @var Node\Name Namespace, class, function or constant to alias */
-    public $name;
-    /** @var Identifier|null Alias */
-    public $alias;
+require __DIR__ . '/../UseItem.php';
 
-    /**
-     * Constructs an alias (use) node.
-     *
-     * @param Node\Name              $name       Namespace/Class to alias
-     * @param null|string|Identifier $alias      Alias
-     * @param int                    $type       Type of the use element (for mixed group use only)
-     * @param array                  $attributes Additional attributes
-     */
-    public function __construct(Node\Name $name, $alias = null, int $type = Use_::TYPE_UNKNOWN, array $attributes = []) {
-        $this->attributes = $attributes;
-        $this->type = $type;
-        $this->name = $name;
-        $this->alias = \is_string($alias) ? new Identifier($alias) : $alias;
-    }
-
-    public function getSubNodeNames() : array {
-        return ['type', 'name', 'alias'];
-    }
-
-    /**
-     * Get alias. If not explicitly given this is the last component of the used name.
-     *
-     * @return Identifier
-     */
-    public function getAlias() : Identifier {
-        if (null !== $this->alias) {
-            return $this->alias;
-        }
-
-        return new Identifier($this->name->getLast());
-    }
-    
-    public function getType() : string {
-        return 'Stmt_UseUse';
+if (false) {
+    // For classmap-authoritative support.
+    class UseUse extends UseItem {
     }
 }

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

@@ -3,33 +3,33 @@
 namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node\Stmt;
+use PhpParser\Node\UseItem;
 
-class Use_ extends Stmt
-{
+class Use_ extends Stmt {
     /**
      * Unknown type. Both Stmt\Use_ / Stmt\GroupUse and Stmt\UseUse have a $type property, one of them will always be
      * TYPE_UNKNOWN while the other has one of the three other possible types. For normal use statements the type on the
      * Stmt\UseUse is unknown. It's only the other way around for mixed group use declarations.
      */
-    const TYPE_UNKNOWN = 0;
+    public const TYPE_UNKNOWN = 0;
     /** Class or namespace import */
-    const TYPE_NORMAL = 1;
+    public const TYPE_NORMAL = 1;
     /** Function import */
-    const TYPE_FUNCTION = 2;
+    public const TYPE_FUNCTION = 2;
     /** Constant import */
-    const TYPE_CONSTANT = 3;
+    public const TYPE_CONSTANT = 3;
 
-    /** @var int Type of alias */
-    public $type;
-    /** @var UseUse[] Aliases */
-    public $uses;
+    /** @var self::TYPE_* Type of alias */
+    public int $type;
+    /** @var UseItem[] Aliases */
+    public array $uses;
 
     /**
      * Constructs an alias (use) list node.
      *
-     * @param UseUse[] $uses       Aliases
-     * @param int      $type       Type of alias
-     * @param array    $attributes Additional attributes
+     * @param UseItem[] $uses Aliases
+     * @param Stmt\Use_::TYPE_* $type Type of alias
+     * @param array<string, mixed> $attributes Additional attributes
      */
     public function __construct(array $uses, int $type = self::TYPE_NORMAL, array $attributes = []) {
         $this->attributes = $attributes;
@@ -37,11 +37,11 @@ class Use_ extends Stmt
         $this->uses = $uses;
     }
 
-    public function getSubNodeNames() : array {
+    public function getSubNodeNames(): array {
         return ['type', 'uses'];
     }
-    
-    public function getType() : string {
+
+    public function getType(): string {
         return 'Stmt_Use';
     }
 }

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

@@ -4,19 +4,18 @@ namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-class While_ extends Node\Stmt
-{
+class While_ extends Node\Stmt {
     /** @var Node\Expr Condition */
-    public $cond;
+    public Node\Expr $cond;
     /** @var Node\Stmt[] Statements */
-    public $stmts;
+    public array $stmts;
 
     /**
      * Constructs a 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 While_ 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_While';
     }
 }

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

@@ -4,6 +4,5 @@ namespace PhpParser\Node;
 
 use PhpParser\NodeAbstract;
 
-abstract class Stmt extends NodeAbstract
-{
+abstract class Stmt extends NodeAbstract {
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/UnionType.php

@@ -2,27 +2,26 @@
 
 namespace PhpParser\Node;
 
-class UnionType extends ComplexType
-{
+class UnionType extends ComplexType {
     /** @var (Identifier|Name|IntersectionType)[] Types */
-    public $types;
+    public array $types;
 
     /**
      * Constructs a union type.
      *
-     * @param (Identifier|Name|IntersectionType)[] $types      Types
-     * @param array               $attributes Additional attributes
+     * @param (Identifier|Name|IntersectionType)[] $types Types
+     * @param array<string, mixed> $attributes Additional attributes
      */
     public function __construct(array $types, array $attributes = []) {
         $this->attributes = $attributes;
         $this->types = $types;
     }
 
-    public function getSubNodeNames() : array {
+    public function getSubNodeNames(): array {
         return ['types'];
     }
-    
-    public function getType() : string {
+
+    public function getType(): string {
         return 'UnionType';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/UseItem.php

@@ -0,0 +1,55 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+use PhpParser\Node;
+use PhpParser\NodeAbstract;
+use PhpParser\Node\Stmt\Use_;
+
+class UseItem extends NodeAbstract {
+    /**
+     * @var Use_::TYPE_* One of the Stmt\Use_::TYPE_* constants. Will only differ from TYPE_UNKNOWN for mixed group uses
+     */
+    public int $type;
+    /** @var Node\Name Namespace, class, function or constant to alias */
+    public Name $name;
+    /** @var Identifier|null Alias */
+    public ?Identifier $alias;
+
+    /**
+     * Constructs an alias (use) item node.
+     *
+     * @param Node\Name $name Namespace/Class to alias
+     * @param null|string|Identifier $alias Alias
+     * @param Use_::TYPE_* $type Type of the use element (for mixed group use only)
+     * @param array<string, mixed> $attributes Additional attributes
+     */
+    public function __construct(Node\Name $name, $alias = null, int $type = Use_::TYPE_UNKNOWN, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->type = $type;
+        $this->name = $name;
+        $this->alias = \is_string($alias) ? new Identifier($alias) : $alias;
+    }
+
+    public function getSubNodeNames(): array {
+        return ['type', 'name', 'alias'];
+    }
+
+    /**
+     * Get alias. If not explicitly given this is the last component of the used name.
+     */
+    public function getAlias(): Identifier {
+        if (null !== $this->alias) {
+            return $this->alias;
+        }
+
+        return new Identifier($this->name->getLast());
+    }
+
+    public function getType(): string {
+        return 'UseItem';
+    }
+}
+
+// @deprecated compatibility alias
+class_alias(UseItem::class, Stmt\UseUse::class);

package/plugins/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php

@@ -9,9 +9,8 @@ namespace PhpParser\Node;
  * Examples: Names in property declarations are formatted as variables. Names in static property
  * lookups are also formatted as variables.
  */
-class VarLikeIdentifier extends Identifier
-{
-    public function getType() : string {
+class VarLikeIdentifier extends Identifier {
+    public function getType(): string {
         return 'VarLikeIdentifier';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/VariadicPlaceholder.php

@@ -11,7 +11,7 @@ class VariadicPlaceholder extends NodeAbstract {
     /**
      * Create a variadic argument placeholder (first-class callable syntax).
      *
-     * @param array $attributes Additional attributes
+     * @param array<string, mixed> $attributes Additional attributes
      */
     public function __construct(array $attributes = []) {
         $this->attributes = $attributes;
@@ -24,4 +24,4 @@ class VariadicPlaceholder extends NodeAbstract {
     public function getSubNodeNames(): array {
         return [];
     }
-}
+}

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

@@ -2,28 +2,31 @@
 
 namespace PhpParser;
 
-interface Node
-{
+interface Node {
     /**
      * Gets the type of the node.
      *
+     * @psalm-return non-empty-string
      * @return string Type of the node
      */
-    public function getType() : string;
+    public function getType(): string;
 
     /**
      * Gets the names of the sub nodes.
      *
-     * @return array Names of sub nodes
+     * @return string[] Names of sub nodes
      */
-    public function getSubNodeNames() : array;
+    public function getSubNodeNames(): array;
 
     /**
      * Gets line the node started in (alias of getStartLine).
      *
      * @return int Start line (or -1 if not available)
+     * @phpstan-return -1|positive-int
+     *
+     * @deprecated Use getStartLine() instead
      */
-    public function getLine() : int;
+    public function getLine(): int;
 
     /**
      * Gets line the node started in.
@@ -31,8 +34,9 @@ interface Node
      * Requires the 'startLine' attribute to be enabled in the lexer (enabled by default).
      *
      * @return int Start line (or -1 if not available)
+     * @phpstan-return -1|positive-int
      */
-    public function getStartLine() : int;
+    public function getStartLine(): int;
 
     /**
      * Gets the line the node ended in.
@@ -40,8 +44,9 @@ interface Node
      * Requires the 'endLine' attribute to be enabled in the lexer (enabled by default).
      *
      * @return int End line (or -1 if not available)
+     * @phpstan-return -1|positive-int
      */
-    public function getEndLine() : int;
+    public function getEndLine(): int;
 
     /**
      * Gets the token offset of the first token that is part of this node.
@@ -52,7 +57,7 @@ interface Node
      *
      * @return int Token start position (or -1 if not available)
      */
-    public function getStartTokenPos() : int;
+    public function getStartTokenPos(): int;
 
     /**
      * Gets the token offset of the last token that is part of this node.
@@ -63,7 +68,7 @@ interface Node
      *
      * @return int Token end position (or -1 if not available)
      */
-    public function getEndTokenPos() : int;
+    public function getEndTokenPos(): int;
 
     /**
      * Gets the file offset of the first character that is part of this node.
@@ -72,7 +77,7 @@ interface Node
      *
      * @return int File start position (or -1 if not available)
      */
-    public function getStartFilePos() : int;
+    public function getStartFilePos(): int;
 
     /**
      * Gets the file offset of the last character that is part of this node.
@@ -81,7 +86,7 @@ interface Node
      *
      * @return int File end position (or -1 if not available)
      */
-    public function getEndFilePos() : int;
+    public function getEndFilePos(): int;
 
     /**
      * Gets all comments directly preceding this node.
@@ -90,14 +95,14 @@ interface Node
      *
      * @return Comment[]
      */
-    public function getComments() : array;
+    public function getComments(): array;
 
     /**
      * Gets the doc comment of the node.
      *
      * @return null|Comment\Doc Doc comment object or null
      */
-    public function getDocComment();
+    public function getDocComment(): ?Comment\Doc;
 
     /**
      * Sets the doc comment of the node.
@@ -106,30 +111,24 @@ interface Node
      *
      * @param Comment\Doc $docComment Doc comment to set
      */
-    public function setDocComment(Comment\Doc $docComment);
+    public function setDocComment(Comment\Doc $docComment): void;
 
     /**
      * Sets an attribute on a node.
      *
-     * @param string $key
-     * @param mixed  $value
+     * @param mixed $value
      */
-    public function setAttribute(string $key, $value);
+    public function setAttribute(string $key, $value): void;
 
     /**
      * Returns whether an attribute exists.
-     *
-     * @param string $key
-     *
-     * @return bool
      */
-    public function hasAttribute(string $key) : bool;
+    public function hasAttribute(string $key): bool;
 
     /**
      * Returns the value of an attribute.
      *
-     * @param string $key
-     * @param mixed  $default
+     * @param mixed $default
      *
      * @return mixed
      */
@@ -138,14 +137,14 @@ interface Node
     /**
      * Returns all the attributes of this node.
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    public function getAttributes() : array;
+    public function getAttributes(): array;
 
     /**
      * Replaces all the attributes of this node.
      *
-     * @param array $attributes
+     * @param array<string, mixed> $attributes
      */
-    public function setAttributes(array $attributes);
+    public function setAttributes(array $attributes): void;
 }