@appthreat/atom 1.8.1 → 1.8.3

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

@@ -10,14 +10,17 @@ use PhpParser\Node\Name;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Use_;
 
-class BuilderFactory {
+class BuilderFactory
+{
     /**
      * Creates an attribute node.
      *
      * @param string|Name $name Name of the attribute
-     * @param array $args Attribute named arguments
+     * @param array       $args Attribute named arguments
+     *
+     * @return Node\Attribute
      */
-    public function attribute($name, array $args = []): Node\Attribute {
+    public function attribute($name, array $args = []) : Node\Attribute {
         return new Node\Attribute(
             BuilderHelpers::normalizeName($name),
             $this->args($args)
@@ -31,7 +34,7 @@ class BuilderFactory {
      *
      * @return Builder\Namespace_ The created namespace builder
      */
-    public function namespace($name): Builder\Namespace_ {
+    public function namespace($name) : Builder\Namespace_ {
         return new Builder\Namespace_($name);
     }
 
@@ -42,7 +45,7 @@ class BuilderFactory {
      *
      * @return Builder\Class_ The created class builder
      */
-    public function class(string $name): Builder\Class_ {
+    public function class(string $name) : Builder\Class_ {
         return new Builder\Class_($name);
     }
 
@@ -53,7 +56,7 @@ class BuilderFactory {
      *
      * @return Builder\Interface_ The created interface builder
      */
-    public function interface(string $name): Builder\Interface_ {
+    public function interface(string $name) : Builder\Interface_ {
         return new Builder\Interface_($name);
     }
 
@@ -64,7 +67,7 @@ class BuilderFactory {
      *
      * @return Builder\Trait_ The created trait builder
      */
-    public function trait(string $name): Builder\Trait_ {
+    public function trait(string $name) : Builder\Trait_ {
         return new Builder\Trait_($name);
     }
 
@@ -75,7 +78,7 @@ class BuilderFactory {
      *
      * @return Builder\Enum_ The created enum builder
      */
-    public function enum(string $name): Builder\Enum_ {
+    public function enum(string $name) : Builder\Enum_ {
         return new Builder\Enum_($name);
     }
 
@@ -84,21 +87,21 @@ class BuilderFactory {
      *
      * @param Node\Name|string ...$traits Trait names
      *
-     * @return Builder\TraitUse The created trait use builder
+     * @return Builder\TraitUse The create trait use builder
      */
-    public function useTrait(...$traits): Builder\TraitUse {
+    public function useTrait(...$traits) : Builder\TraitUse {
         return new Builder\TraitUse(...$traits);
     }
 
     /**
      * Creates a trait use adaptation builder.
      *
-     * @param Node\Name|string|null $trait Trait name
+     * @param Node\Name|string|null  $trait  Trait name
      * @param Node\Identifier|string $method Method name
      *
-     * @return Builder\TraitUseAdaptation The created trait use adaptation builder
+     * @return Builder\TraitUseAdaptation The create trait use adaptation builder
      */
-    public function traitUseAdaptation($trait, $method = null): Builder\TraitUseAdaptation {
+    public function traitUseAdaptation($trait, $method = null) : Builder\TraitUseAdaptation {
         if ($method === null) {
             $method = $trait;
             $trait = null;
@@ -114,7 +117,7 @@ class BuilderFactory {
      *
      * @return Builder\Method The created method builder
      */
-    public function method(string $name): Builder\Method {
+    public function method(string $name) : Builder\Method {
         return new Builder\Method($name);
     }
 
@@ -125,7 +128,7 @@ class BuilderFactory {
      *
      * @return Builder\Param The created parameter builder
      */
-    public function param(string $name): Builder\Param {
+    public function param(string $name) : Builder\Param {
         return new Builder\Param($name);
     }
 
@@ -136,7 +139,7 @@ class BuilderFactory {
      *
      * @return Builder\Property The created property builder
      */
-    public function property(string $name): Builder\Property {
+    public function property(string $name) : Builder\Property {
         return new Builder\Property($name);
     }
 
@@ -147,7 +150,7 @@ class BuilderFactory {
      *
      * @return Builder\Function_ The created function builder
      */
-    public function function(string $name): Builder\Function_ {
+    public function function(string $name) : Builder\Function_ {
         return new Builder\Function_($name);
     }
 
@@ -158,7 +161,7 @@ class BuilderFactory {
      *
      * @return Builder\Use_ The created use builder
      */
-    public function use($name): Builder\Use_ {
+    public function use($name) : Builder\Use_ {
         return new Builder\Use_($name, Use_::TYPE_NORMAL);
     }
 
@@ -169,7 +172,7 @@ class BuilderFactory {
      *
      * @return Builder\Use_ The created use function builder
      */
-    public function useFunction($name): Builder\Use_ {
+    public function useFunction($name) : Builder\Use_ {
         return new Builder\Use_($name, Use_::TYPE_FUNCTION);
     }
 
@@ -180,30 +183,30 @@ class BuilderFactory {
      *
      * @return Builder\Use_ The created use const builder
      */
-    public function useConst($name): Builder\Use_ {
+    public function useConst($name) : Builder\Use_ {
         return new Builder\Use_($name, Use_::TYPE_CONSTANT);
     }
 
     /**
      * 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
      *
      * @return Builder\ClassConst The created use const builder
      */
-    public function classConst($name, $value): Builder\ClassConst {
+    public function classConst($name, $value) : Builder\ClassConst {
         return new Builder\ClassConst($name, $value);
     }
 
     /**
      * Creates an enum case builder.
      *
-     * @param string|Identifier $name Name
+     * @param string|Identifier $name  Name
      *
      * @return Builder\EnumCase The created use const builder
      */
-    public function enumCase($name): Builder\EnumCase {
+    public function enumCase($name) : Builder\EnumCase {
         return new Builder\EnumCase($name);
     }
 
@@ -211,8 +214,10 @@ class BuilderFactory {
      * Creates node a for a literal value.
      *
      * @param Expr|bool|null|int|float|string|array $value $value
+     *
+     * @return Expr
      */
-    public function val($value): Expr {
+    public function val($value) : Expr {
         return BuilderHelpers::normalizeValue($value);
     }
 
@@ -220,8 +225,10 @@ class BuilderFactory {
      * Creates variable node.
      *
      * @param string|Expr $name Name
+     *
+     * @return Expr\Variable
      */
-    public function var($name): Expr\Variable {
+    public function var($name) : Expr\Variable {
         if (!\is_string($name) && !$name instanceof Expr) {
             throw new \LogicException('Variable name must be string or Expr');
         }
@@ -236,9 +243,9 @@ class BuilderFactory {
      *
      * @param array $args List of arguments to normalize
      *
-     * @return list<Arg>
+     * @return Arg[]
      */
-    public function args(array $args): array {
+    public function args(array $args) : array {
         $normalizedArgs = [];
         foreach ($args as $key => $arg) {
             if (!($arg instanceof Arg)) {
@@ -256,9 +263,11 @@ class BuilderFactory {
      * Creates a function call node.
      *
      * @param string|Name|Expr $name Function name
-     * @param array $args Function arguments
+     * @param array            $args Function arguments
+     *
+     * @return Expr\FuncCall
      */
-    public function funcCall($name, array $args = []): Expr\FuncCall {
+    public function funcCall($name, array $args = []) : Expr\FuncCall {
         return new Expr\FuncCall(
             BuilderHelpers::normalizeNameOrExpr($name),
             $this->args($args)
@@ -268,11 +277,13 @@ class BuilderFactory {
     /**
      * Creates a method call node.
      *
-     * @param Expr $var Variable the method is called on
+     * @param Expr                   $var  Variable the method is called on
      * @param string|Identifier|Expr $name Method name
-     * @param array $args Method arguments
+     * @param array                  $args Method arguments
+     *
+     * @return Expr\MethodCall
      */
-    public function methodCall(Expr $var, $name, array $args = []): Expr\MethodCall {
+    public function methodCall(Expr $var, $name, array $args = []) : Expr\MethodCall {
         return new Expr\MethodCall(
             $var,
             BuilderHelpers::normalizeIdentifierOrExpr($name),
@@ -283,11 +294,13 @@ class BuilderFactory {
     /**
      * Creates a static method call node.
      *
-     * @param string|Name|Expr $class Class name
-     * @param string|Identifier|Expr $name Method name
-     * @param array $args Method arguments
+     * @param string|Name|Expr       $class Class name
+     * @param string|Identifier|Expr $name  Method name
+     * @param array                  $args  Method arguments
+     *
+     * @return Expr\StaticCall
      */
-    public function staticCall($class, $name, array $args = []): Expr\StaticCall {
+    public function staticCall($class, $name, array $args = []) : Expr\StaticCall {
         return new Expr\StaticCall(
             BuilderHelpers::normalizeNameOrExpr($class),
             BuilderHelpers::normalizeIdentifierOrExpr($name),
@@ -299,9 +312,11 @@ class BuilderFactory {
      * Creates an object creation node.
      *
      * @param string|Name|Expr $class Class name
-     * @param array $args Constructor arguments
+     * @param array            $args  Constructor arguments
+     *
+     * @return Expr\New_
      */
-    public function new($class, array $args = []): Expr\New_ {
+    public function new($class, array $args = []) : Expr\New_ {
         return new Expr\New_(
             BuilderHelpers::normalizeNameOrExpr($class),
             $this->args($args)
@@ -312,18 +327,22 @@ class BuilderFactory {
      * Creates a constant fetch node.
      *
      * @param string|Name $name Constant name
+     *
+     * @return Expr\ConstFetch
      */
-    public function constFetch($name): Expr\ConstFetch {
+    public function constFetch($name) : Expr\ConstFetch {
         return new Expr\ConstFetch(BuilderHelpers::normalizeName($name));
     }
 
     /**
      * Creates a property fetch node.
      *
-     * @param Expr $var Variable holding object
+     * @param Expr                   $var  Variable holding object
      * @param string|Identifier|Expr $name Property name
+     *
+     * @return Expr\PropertyFetch
      */
-    public function propertyFetch(Expr $var, $name): Expr\PropertyFetch {
+    public function propertyFetch(Expr $var, $name) : Expr\PropertyFetch {
         return new Expr\PropertyFetch($var, BuilderHelpers::normalizeIdentifierOrExpr($name));
     }
 
@@ -331,7 +350,9 @@ class BuilderFactory {
      * Creates a class constant fetch node.
      *
      * @param string|Name|Expr $class Class name
-     * @param string|Identifier|Expr $name Constant name
+     * @param string|Identifier|Expr $name  Constant name
+     *
+     * @return Expr\ClassConstFetch
      */
     public function classConstFetch($class, $name): Expr\ClassConstFetch {
         return new Expr\ClassConstFetch(
@@ -344,8 +365,10 @@ class BuilderFactory {
      * Creates nested Concat nodes from a list of expressions.
      *
      * @param Expr|string ...$exprs Expressions or literal strings
+     *
+     * @return Concat
      */
-    public function concat(...$exprs): Concat {
+    public function concat(...$exprs) : Concat {
         $numExprs = count($exprs);
         if ($numExprs < 2) {
             throw new \LogicException('Expected at least two expressions');
@@ -360,8 +383,9 @@ class BuilderFactory {
 
     /**
      * @param string|Expr $expr
+     * @return Expr
      */
-    private function normalizeStringExpr($expr): Expr {
+    private function normalizeStringExpr($expr) : Expr {
         if ($expr instanceof Expr) {
             return $expr;
         }

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

@@ -15,7 +15,8 @@ use PhpParser\Node\Stmt;
  *
  * @internal
  */
-final class BuilderHelpers {
+final class BuilderHelpers
+{
     /**
      * Normalizes a node: Converts builder objects to nodes.
      *
@@ -23,7 +24,7 @@ final class BuilderHelpers {
      *
      * @return Node The normalized node
      */
-    public static function normalizeNode($node): Node {
+    public static function normalizeNode($node) : Node {
         if ($node instanceof Builder) {
             return $node->getNode();
         }
@@ -44,7 +45,7 @@ final class BuilderHelpers {
      *
      * @return Stmt The normalized statement node
      */
-    public static function normalizeStmt($node): Stmt {
+    public static function normalizeStmt($node) : Stmt {
         $node = self::normalizeNode($node);
         if ($node instanceof Stmt) {
             return $node;
@@ -64,7 +65,7 @@ final class BuilderHelpers {
      *
      * @return Identifier The normalized identifier
      */
-    public static function normalizeIdentifier($name): Identifier {
+    public static function normalizeIdentifier($name) : Identifier {
         if ($name instanceof Identifier) {
             return $name;
         }
@@ -102,7 +103,7 @@ final class BuilderHelpers {
      *
      * @return Name The normalized name
      */
-    public static function normalizeName($name): Name {
+    public static function normalizeName($name) : Name {
         if ($name instanceof Name) {
             return $name;
         }
@@ -218,7 +219,7 @@ final class BuilderHelpers {
      *
      * @return Expr The normalized value
      */
-    public static function normalizeValue($value): Expr {
+    public static function normalizeValue($value) : Expr {
         if ($value instanceof Node\Expr) {
             return $value;
         }
@@ -236,11 +237,11 @@ final class BuilderHelpers {
         }
 
         if (is_int($value)) {
-            return new Scalar\Int_($value);
+            return new Scalar\LNumber($value);
         }
 
         if (is_float($value)) {
-            return new Scalar\Float_($value);
+            return new Scalar\DNumber($value);
         }
 
         if (is_string($value)) {
@@ -253,12 +254,12 @@ final class BuilderHelpers {
             foreach ($value as $itemKey => $itemValue) {
                 // for consecutive, numeric keys don't generate keys
                 if (null !== $lastKey && ++$lastKey === $itemKey) {
-                    $items[] = new Node\ArrayItem(
+                    $items[] = new Expr\ArrayItem(
                         self::normalizeValue($itemValue)
                     );
                 } else {
                     $lastKey = null;
-                    $items[] = new Node\ArrayItem(
+                    $items[] = new Expr\ArrayItem(
                         self::normalizeValue($itemValue),
                         self::normalizeValue($itemKey)
                     );
@@ -278,7 +279,7 @@ final class BuilderHelpers {
      *
      * @return Comment\Doc The normalized doc comment
      */
-    public static function normalizeDocComment($docComment): Comment\Doc {
+    public static function normalizeDocComment($docComment) : Comment\Doc {
         if ($docComment instanceof Comment\Doc) {
             return $docComment;
         }
@@ -297,7 +298,8 @@ final class BuilderHelpers {
      *
      * @return Node\AttributeGroup The Attribute Group
      */
-    public static function normalizeAttribute($attribute): Node\AttributeGroup {
+    public static function normalizeAttribute($attribute) : Node\AttributeGroup
+    {
         if ($attribute instanceof Node\AttributeGroup) {
             return $attribute;
         }
@@ -313,12 +315,12 @@ final class BuilderHelpers {
      * Adds a modifier and returns new modifier bitmask.
      *
      * @param int $modifiers Existing modifiers
-     * @param int $modifier Modifier to set
+     * @param int $modifier  Modifier to set
      *
      * @return int New modifiers
      */
-    public static function addModifier(int $modifiers, int $modifier): int {
-        Modifiers::verifyModifier($modifiers, $modifier);
+    public static function addModifier(int $modifiers, int $modifier) : int {
+        Stmt\Class_::verifyModifier($modifiers, $modifier);
         return $modifiers | $modifier;
     }
 
@@ -326,8 +328,8 @@ final class BuilderHelpers {
      * Adds a modifier and returns new modifier bitmask.
      * @return int New modifiers
      */
-    public static function addClassModifier(int $existingModifiers, int $modifierToSet): int {
-        Modifiers::verifyClassModifier($existingModifiers, $modifierToSet);
+    public static function addClassModifier(int $existingModifiers, int $modifierToSet) : int {
+        Stmt\Class_::verifyClassModifier($existingModifiers, $modifierToSet);
         return $existingModifiers | $modifierToSet;
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Comment/Doc.php

@@ -2,5 +2,6 @@
 
 namespace PhpParser\Comment;
 
-class Doc extends \PhpParser\Comment {
+class Doc extends \PhpParser\Comment
+{
 }

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

@@ -2,22 +2,23 @@
 
 namespace PhpParser;
 
-class Comment implements \JsonSerializable {
-    protected string $text;
-    protected int $startLine;
-    protected int $startFilePos;
-    protected int $startTokenPos;
-    protected int $endLine;
-    protected int $endFilePos;
-    protected int $endTokenPos;
+class Comment implements \JsonSerializable
+{
+    protected $text;
+    protected $startLine;
+    protected $startFilePos;
+    protected $startTokenPos;
+    protected $endLine;
+    protected $endFilePos;
+    protected $endTokenPos;
 
     /**
      * Constructs a comment node.
      *
-     * @param string $text Comment text (including comment delimiters like /*)
-     * @param int $startLine Line number the comment started on
-     * @param int $startFilePos File offset the comment started on
-     * @param int $startTokenPos Token offset the comment started on
+     * @param string $text          Comment text (including comment delimiters like /*)
+     * @param int    $startLine     Line number the comment started on
+     * @param int    $startFilePos  File offset the comment started on
+     * @param int    $startTokenPos Token offset the comment started on
      */
     public function __construct(
         string $text,
@@ -38,7 +39,7 @@ class Comment implements \JsonSerializable {
      *
      * @return string The comment text (including comment delimiters like /*)
      */
-    public function getText(): string {
+    public function getText() : string {
         return $this->text;
     }
 
@@ -47,7 +48,7 @@ class Comment implements \JsonSerializable {
      *
      * @return int Line number (or -1 if not available)
      */
-    public function getStartLine(): int {
+    public function getStartLine() : int {
         return $this->startLine;
     }
 
@@ -56,7 +57,7 @@ class Comment implements \JsonSerializable {
      *
      * @return int File offset (or -1 if not available)
      */
-    public function getStartFilePos(): int {
+    public function getStartFilePos() : int {
         return $this->startFilePos;
     }
 
@@ -65,7 +66,7 @@ class Comment implements \JsonSerializable {
      *
      * @return int Token offset (or -1 if not available)
      */
-    public function getStartTokenPos(): int {
+    public function getStartTokenPos() : int {
         return $this->startTokenPos;
     }
 
@@ -74,7 +75,7 @@ class Comment implements \JsonSerializable {
      *
      * @return int Line number (or -1 if not available)
      */
-    public function getEndLine(): int {
+    public function getEndLine() : int {
         return $this->endLine;
     }
 
@@ -83,7 +84,7 @@ class Comment implements \JsonSerializable {
      *
      * @return int File offset (or -1 if not available)
      */
-    public function getEndFilePos(): int {
+    public function getEndFilePos() : int {
         return $this->endFilePos;
     }
 
@@ -92,16 +93,49 @@ class Comment implements \JsonSerializable {
      *
      * @return int Token offset (or -1 if not available)
      */
-    public function getEndTokenPos(): int {
+    public function getEndTokenPos() : int {
         return $this->endTokenPos;
     }
 
+    /**
+     * Gets the line number the comment started on.
+     *
+     * @deprecated Use getStartLine() instead
+     *
+     * @return int Line number
+     */
+    public function getLine() : int {
+        return $this->startLine;
+    }
+
+    /**
+     * Gets the file offset the comment started on.
+     *
+     * @deprecated Use getStartFilePos() instead
+     *
+     * @return int File offset
+     */
+    public function getFilePos() : int {
+        return $this->startFilePos;
+    }
+
+    /**
+     * Gets the token offset the comment started on.
+     *
+     * @deprecated Use getStartTokenPos() instead
+     *
+     * @return int Token offset
+     */
+    public function getTokenPos() : int {
+        return $this->startTokenPos;
+    }
+
     /**
      * Gets the comment text.
      *
      * @return string The comment text (including comment delimiters like /*)
      */
-    public function __toString(): string {
+    public function __toString() : string {
         return $this->text;
     }
 
@@ -110,19 +144,18 @@ class Comment implements \JsonSerializable {
      *
      * "Reformatted" here means that we try to clean up the whitespace at the
      * starts of the lines. This is necessary because we receive the comments
-     * without leading whitespace on the first line, but with leading whitespace
+     * without trailing whitespace on the first line, but with trailing whitespace
      * on all subsequent lines.
      *
-     * Additionally, this normalizes CRLF newlines to LF newlines.
+     * @return mixed|string
      */
-    public function getReformattedText(): string {
-        $text = str_replace("\r\n", "\n", $this->text);
+    public function getReformattedText() {
+        $text = trim($this->text);
         $newlinePos = strpos($text, "\n");
         if (false === $newlinePos) {
             // Single line comments don't need further processing
             return $text;
-        }
-        if (preg_match('(^.*(?:\n\s+\*.*)+$)', $text)) {
+        } elseif (preg_match('((*BSR_ANYCRLF)(*ANYCRLF)^.*(?:\R\s+\*.*)+$)', $text)) {
             // Multi line comment of the type
             //
             //     /*
@@ -131,9 +164,8 @@ class Comment implements \JsonSerializable {
             //      */
             //
             // is handled by replacing the whitespace sequences before the * by a single space
-            return preg_replace('(^\s+\*)m', ' *', $text);
-        }
-        if (preg_match('(^/\*\*?\s*\n)', $text) && preg_match('(\n(\s*)\*/$)', $text, $matches)) {
+            return preg_replace('(^\s+\*)m', ' *', $this->text);
+        } elseif (preg_match('(^/\*\*?\s*[\r\n])', $text) && preg_match('(\n(\s*)\*/$)', $text, $matches)) {
             // Multi line comment of the type
             //
             //    /*
@@ -145,8 +177,7 @@ class Comment implements \JsonSerializable {
             // */ on all lines. So if the last line is "    */", then "    " is removed at the
             // start of all lines.
             return preg_replace('(^' . preg_quote($matches[1]) . ')m', '', $text);
-        }
-        if (preg_match('(^/\*\*?\s*(?!\s))', $text, $matches)) {
+        } elseif (preg_match('(^/\*\*?\s*(?!\s))', $text, $matches)) {
             // Multi line comment of the type
             //
             //     /* Some text.
@@ -173,9 +204,9 @@ class Comment implements \JsonSerializable {
      * @param string $str String to check
      * @return int Length in characters. Tabs count as single characters.
      */
-    private function getShortestWhitespacePrefixLen(string $str): int {
+    private function getShortestWhitespacePrefixLen(string $str) : int {
         $lines = explode("\n", $str);
-        $shortestPrefixLen = \PHP_INT_MAX;
+        $shortestPrefixLen = \INF;
         foreach ($lines as $line) {
             preg_match('(^\s*)', $line, $matches);
             $prefixLen = strlen($matches[0]);
@@ -187,9 +218,10 @@ class Comment implements \JsonSerializable {
     }
 
     /**
-     * @return array{nodeType:string, text:mixed, line:mixed, filePos:mixed}
+     * @return       array
+     * @psalm-return array{nodeType:string, text:mixed, line:mixed, filePos:mixed}
      */
-    public function jsonSerialize(): array {
+    public function jsonSerialize() : array {
         // Technically not a node, but we make it look like one anyway
         $type = $this instanceof Comment\Doc ? 'Comment_Doc' : 'Comment';
         return [

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

@@ -1,6 +1,6 @@
-<?php declare(strict_types=1);
+<?php
 
 namespace PhpParser;
 
-class ConstExprEvaluationException extends \Exception {
-}
+class ConstExprEvaluationException extends \Exception
+{}