@appthreat/atom 1.8.1 → 1.8.2

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

@@ -1,3 +1,30 @@
 <?php declare(strict_types=1);
 
-require __DIR__ . '/../InterpolatedStringPart.php';
+namespace PhpParser\Node\Scalar;
+
+use PhpParser\Node\Scalar;
+
+class EncapsedStringPart extends Scalar
+{
+    /** @var string String value */
+    public $value;
+
+    /**
+     * Constructs a node representing a string part of an encapsed string.
+     *
+     * @param string $value      String value
+     * @param array  $attributes Additional attributes
+     */
+    public function __construct(string $value, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->value = $value;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['value'];
+    }
+    
+    public function getType() : string {
+        return 'Scalar_EncapsedStringPart';
+    }
+}

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

@@ -1,3 +1,80 @@
 <?php declare(strict_types=1);
 
-require __DIR__ . '/Int_.php';
+namespace PhpParser\Node\Scalar;
+
+use PhpParser\Error;
+use PhpParser\Node\Scalar;
+
+class LNumber extends Scalar
+{
+    /* For use in "kind" attribute */
+    const KIND_BIN = 2;
+    const KIND_OCT = 8;
+    const KIND_DEC = 10;
+    const KIND_HEX = 16;
+
+    /** @var int Number value */
+    public $value;
+
+    /**
+     * Constructs an integer number scalar node.
+     *
+     * @param int   $value      Value of the number
+     * @param array $attributes Additional attributes
+     */
+    public function __construct(int $value, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->value = $value;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['value'];
+    }
+
+    /**
+     * Constructs an LNumber node from a string number literal.
+     *
+     * @param string $str               String number literal (decimal, octal, hex or binary)
+     * @param array  $attributes        Additional attributes
+     * @param bool   $allowInvalidOctal Whether to allow invalid octal numbers (PHP 5)
+     *
+     * @return LNumber The constructed LNumber, including kind attribute
+     */
+    public static function fromString(string $str, array $attributes = [], bool $allowInvalidOctal = false) : LNumber {
+        $attributes['rawValue'] = $str;
+
+        $str = str_replace('_', '', $str);
+
+        if ('0' !== $str[0] || '0' === $str) {
+            $attributes['kind'] = LNumber::KIND_DEC;
+            return new LNumber((int) $str, $attributes);
+        }
+
+        if ('x' === $str[1] || 'X' === $str[1]) {
+            $attributes['kind'] = LNumber::KIND_HEX;
+            return new LNumber(hexdec($str), $attributes);
+        }
+
+        if ('b' === $str[1] || 'B' === $str[1]) {
+            $attributes['kind'] = LNumber::KIND_BIN;
+            return new LNumber(bindec($str), $attributes);
+        }
+
+        if (!$allowInvalidOctal && strpbrk($str, '89')) {
+            throw new Error('Invalid numeric literal', $attributes);
+        }
+
+        // Strip optional explicit octal prefix.
+        if ('o' === $str[1] || 'O' === $str[1]) {
+            $str = substr($str, 2);
+        }
+
+        // use intval instead of octdec to get proper cutting behavior with malformed numbers
+        $attributes['kind'] = LNumber::KIND_OCT;
+        return new LNumber(intval($str, 8), $attributes);
+    }
+
+    public function getType() : string {
+        return 'Scalar_LNumber';
+    }
+}

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

@@ -4,12 +4,13 @@ namespace PhpParser\Node\Scalar\MagicConst;
 
 use PhpParser\Node\Scalar\MagicConst;
 
-class Class_ extends MagicConst {
-    public function getName(): string {
+class Class_ extends MagicConst
+{
+    public function getName() : string {
         return '__CLASS__';
     }
-
-    public function getType(): string {
+    
+    public function getType() : string {
         return 'Scalar_MagicConst_Class';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Dir.php

@@ -4,12 +4,13 @@ namespace PhpParser\Node\Scalar\MagicConst;
 
 use PhpParser\Node\Scalar\MagicConst;
 
-class Dir extends MagicConst {
-    public function getName(): string {
+class Dir extends MagicConst
+{
+    public function getName() : string {
         return '__DIR__';
     }
-
-    public function getType(): string {
+    
+    public function getType() : string {
         return 'Scalar_MagicConst_Dir';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/File.php

@@ -4,12 +4,13 @@ namespace PhpParser\Node\Scalar\MagicConst;
 
 use PhpParser\Node\Scalar\MagicConst;
 
-class File extends MagicConst {
-    public function getName(): string {
+class File extends MagicConst
+{
+    public function getName() : string {
         return '__FILE__';
     }
-
-    public function getType(): string {
+    
+    public function getType() : string {
         return 'Scalar_MagicConst_File';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Function_.php

@@ -4,12 +4,13 @@ namespace PhpParser\Node\Scalar\MagicConst;
 
 use PhpParser\Node\Scalar\MagicConst;
 
-class Function_ extends MagicConst {
-    public function getName(): string {
+class Function_ extends MagicConst
+{
+    public function getName() : string {
         return '__FUNCTION__';
     }
-
-    public function getType(): string {
+    
+    public function getType() : string {
         return 'Scalar_MagicConst_Function';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Line.php

@@ -4,12 +4,13 @@ namespace PhpParser\Node\Scalar\MagicConst;
 
 use PhpParser\Node\Scalar\MagicConst;
 
-class Line extends MagicConst {
-    public function getName(): string {
+class Line extends MagicConst
+{
+    public function getName() : string {
         return '__LINE__';
     }
-
-    public function getType(): string {
+    
+    public function getType() : string {
         return 'Scalar_MagicConst_Line';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Method.php

@@ -4,12 +4,13 @@ namespace PhpParser\Node\Scalar\MagicConst;
 
 use PhpParser\Node\Scalar\MagicConst;
 
-class Method extends MagicConst {
-    public function getName(): string {
+class Method extends MagicConst
+{
+    public function getName() : string {
         return '__METHOD__';
     }
-
-    public function getType(): string {
+    
+    public function getType() : string {
         return 'Scalar_MagicConst_Method';
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Namespace_.php

@@ -4,12 +4,13 @@ namespace PhpParser\Node\Scalar\MagicConst;
 
 use PhpParser\Node\Scalar\MagicConst;
 
-class Namespace_ extends MagicConst {
-    public function getName(): string {
+class Namespace_ extends MagicConst
+{
+    public function getName() : string {
         return '__NAMESPACE__';
     }
-
-    public function getType(): string {
+    
+    public function getType() : string {
         return 'Scalar_MagicConst_Namespace';
     }
 }

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

@@ -4,12 +4,13 @@ namespace PhpParser\Node\Scalar\MagicConst;
 
 use PhpParser\Node\Scalar\MagicConst;
 
-class Trait_ extends MagicConst {
-    public function getName(): string {
+class Trait_ extends MagicConst
+{
+    public function getName() : string {
         return '__TRAIT__';
     }
-
-    public function getType(): string {
+    
+    public function getType() : string {
         return 'Scalar_MagicConst_Trait';
     }
 }

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

@@ -4,17 +4,18 @@ namespace PhpParser\Node\Scalar;
 
 use PhpParser\Node\Scalar;
 
-abstract class MagicConst extends Scalar {
+abstract class MagicConst extends Scalar
+{
     /**
      * Constructs a magic constant node.
      *
-     * @param array<string, mixed> $attributes Additional attributes
+     * @param array $attributes Additional attributes
      */
     public function __construct(array $attributes = []) {
         $this->attributes = $attributes;
     }
 
-    public function getSubNodeNames(): array {
+    public function getSubNodeNames() : array {
         return [];
     }
 
@@ -23,5 +24,5 @@ abstract class MagicConst extends Scalar {
      *
      * @return string Name of magic constant
      */
-    abstract public function getName(): string;
+    abstract public function getName() : string;
 }

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

@@ -5,18 +5,18 @@ namespace PhpParser\Node\Scalar;
 use PhpParser\Error;
 use PhpParser\Node\Scalar;
 
-class String_ extends Scalar {
+class String_ extends Scalar
+{
     /* For use in "kind" attribute */
-    public const KIND_SINGLE_QUOTED = 1;
-    public const KIND_DOUBLE_QUOTED = 2;
-    public const KIND_HEREDOC = 3;
-    public const KIND_NOWDOC = 4;
+    const KIND_SINGLE_QUOTED = 1;
+    const KIND_DOUBLE_QUOTED = 2;
+    const KIND_HEREDOC = 3;
+    const KIND_NOWDOC = 4;
 
     /** @var string String value */
-    public string $value;
+    public $value;
 
-    /** @var array<string, string> Escaped character to its decoded value */
-    protected static array $replacements = [
+    protected static $replacements = [
         '\\' => '\\',
         '$'  =>  '$',
         'n'  => "\n",
@@ -30,23 +30,23 @@ class String_ extends Scalar {
     /**
      * Constructs a string scalar node.
      *
-     * @param string $value Value of the string
-     * @param array<string, mixed> $attributes Additional attributes
+     * @param string $value      Value of the string
+     * @param array  $attributes Additional attributes
      */
     public function __construct(string $value, array $attributes = []) {
         $this->attributes = $attributes;
         $this->value = $value;
     }
 
-    public function getSubNodeNames(): array {
+    public function getSubNodeNames() : array {
         return ['value'];
     }
 
     /**
-     * @param array<string, mixed> $attributes
      * @param bool $parseUnicodeEscape Whether to parse PHP 7 \u escapes
      */
-    public static function fromString(string $str, array $attributes = [], bool $parseUnicodeEscape = true): self {
+    public static function fromString(string $str, array $attributes = [], bool $parseUnicodeEscape = true): self
+    {
         $attributes['kind'] = ($str[0] === "'" || ($str[1] === "'" && ($str[0] === 'b' || $str[0] === 'B')))
             ? Scalar\String_::KIND_SINGLE_QUOTED
             : Scalar\String_::KIND_DOUBLE_QUOTED;
@@ -68,7 +68,7 @@ class String_ extends Scalar {
      *
      * @return string The parsed string
      */
-    public static function parse(string $str, bool $parseUnicodeEscape = true): string {
+    public static function parse(string $str, bool $parseUnicodeEscape = true) : string {
         $bLength = 0;
         if ('b' === $str[0] || 'B' === $str[0]) {
             $bLength = 1;
@@ -92,13 +92,13 @@ class String_ extends Scalar {
      *
      * Parses escape sequences in strings (all string types apart from single quoted).
      *
-     * @param string $str String without quotes
+     * @param string      $str   String without quotes
      * @param null|string $quote Quote type
      * @param bool $parseUnicodeEscape Whether to parse PHP 7 \u escapes
      *
      * @return string String with escape sequences parsed
      */
-    public static function parseEscapeSequences(string $str, ?string $quote, bool $parseUnicodeEscape = true): string {
+    public static function parseEscapeSequences(string $str, $quote, bool $parseUnicodeEscape = true) : string {
         if (null !== $quote) {
             $str = str_replace('\\' . $quote, $quote, $str);
         }
@@ -110,19 +110,15 @@ class String_ extends Scalar {
 
         return preg_replace_callback(
             '~\\\\([\\\\$nrtfve]|[xX][0-9a-fA-F]{1,2}|[0-7]{1,3}' . $extra . ')~',
-            function ($matches) {
+            function($matches) {
                 $str = $matches[1];
 
                 if (isset(self::$replacements[$str])) {
                     return self::$replacements[$str];
-                }
-                if ('x' === $str[0] || 'X' === $str[0]) {
+                } elseif ('x' === $str[0] || 'X' === $str[0]) {
                     return chr(hexdec(substr($str, 1)));
-                }
-                if ('u' === $str[0]) {
-                    $dec = hexdec($matches[2]);
-                    // If it overflowed to float, treat as INT_MAX, it will throw an error anyway.
-                    return self::codePointToUtf8(\is_int($dec) ? $dec : \PHP_INT_MAX);
+                } elseif ('u' === $str[0]) {
+                    return self::codePointToUtf8(hexdec($matches[2]));
                 } else {
                     return chr(octdec($str));
                 }
@@ -138,24 +134,24 @@ class String_ extends Scalar {
      *
      * @return string UTF-8 representation of code point
      */
-    private static function codePointToUtf8(int $num): string {
+    private static function codePointToUtf8(int $num) : string {
         if ($num <= 0x7F) {
             return chr($num);
         }
         if ($num <= 0x7FF) {
-            return chr(($num >> 6) + 0xC0) . chr(($num & 0x3F) + 0x80);
+            return chr(($num>>6) + 0xC0) . chr(($num&0x3F) + 0x80);
         }
         if ($num <= 0xFFFF) {
-            return chr(($num >> 12) + 0xE0) . chr((($num >> 6) & 0x3F) + 0x80) . chr(($num & 0x3F) + 0x80);
+            return chr(($num>>12) + 0xE0) . chr((($num>>6)&0x3F) + 0x80) . chr(($num&0x3F) + 0x80);
         }
         if ($num <= 0x1FFFFF) {
-            return chr(($num >> 18) + 0xF0) . chr((($num >> 12) & 0x3F) + 0x80)
-                 . chr((($num >> 6) & 0x3F) + 0x80) . chr(($num & 0x3F) + 0x80);
+            return chr(($num>>18) + 0xF0) . chr((($num>>12)&0x3F) + 0x80)
+                 . chr((($num>>6)&0x3F) + 0x80) . chr(($num&0x3F) + 0x80);
         }
         throw new Error('Invalid UTF-8 codepoint escape sequence: Codepoint too large');
     }
 
-    public function getType(): string {
+    public function getType() : string {
         return 'Scalar_String';
     }
 }

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

@@ -2,5 +2,6 @@
 
 namespace PhpParser\Node;
 
-abstract class Scalar extends Expr {
+abstract class Scalar extends Expr
+{
 }

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

@@ -4,26 +4,27 @@ namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-class Break_ extends Node\Stmt {
+class Break_ extends Node\Stmt
+{
     /** @var null|Node\Expr Number of loops to break */
-    public ?Node\Expr $num;
+    public $num;
 
     /**
      * Constructs a break node.
      *
-     * @param null|Node\Expr $num Number of loops to break
-     * @param array<string, mixed> $attributes Additional attributes
+     * @param null|Node\Expr $num        Number of loops to break
+     * @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_Break';
     }
 }

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

@@ -4,30 +4,31 @@ namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-class Case_ extends Node\Stmt {
+class Case_ extends Node\Stmt
+{
     /** @var null|Node\Expr Condition (null for default) */
-    public ?Node\Expr $cond;
+    public $cond;
     /** @var Node\Stmt[] Statements */
-    public array $stmts;
+    public $stmts;
 
     /**
      * Constructs a case node.
      *
-     * @param null|Node\Expr $cond Condition (null for default)
-     * @param Node\Stmt[] $stmts Statements
-     * @param array<string, mixed> $attributes Additional attributes
+     * @param null|Node\Expr $cond       Condition (null for default)
+     * @param Node\Stmt[]    $stmts      Statements
+     * @param array          $attributes Additional attributes
      */
-    public function __construct(?Node\Expr $cond, array $stmts = [], array $attributes = []) {
+    public function __construct($cond, array $stmts = [], array $attributes = []) {
         $this->attributes = $attributes;
         $this->cond = $cond;
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames(): array {
+    public function getSubNodeNames() : array {
         return ['cond', 'stmts'];
     }
-
-    public function getType(): string {
+    
+    public function getType() : string {
         return 'Stmt_Case';
     }
 }

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

@@ -5,24 +5,25 @@ namespace PhpParser\Node\Stmt;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 
-class Catch_ extends Node\Stmt {
+class Catch_ extends Node\Stmt
+{
     /** @var Node\Name[] Types of exceptions to catch */
-    public array $types;
+    public $types;
     /** @var Expr\Variable|null Variable for exception */
-    public ?Expr\Variable $var;
+    public $var;
     /** @var Node\Stmt[] Statements */
-    public array $stmts;
+    public $stmts;
 
     /**
      * Constructs a catch node.
      *
-     * @param Node\Name[] $types Types of exceptions to catch
-     * @param Expr\Variable|null $var Variable for exception
-     * @param Node\Stmt[] $stmts Statements
-     * @param array<string, mixed> $attributes Additional attributes
+     * @param Node\Name[]           $types      Types of exceptions to catch
+     * @param Expr\Variable|null    $var        Variable for exception
+     * @param Node\Stmt[]           $stmts      Statements
+     * @param array                 $attributes Additional attributes
      */
     public function __construct(
-        array $types, ?Expr\Variable $var = null, array $stmts = [], array $attributes = []
+        array $types, Expr\Variable $var = null, array $stmts = [], array $attributes = []
     ) {
         $this->attributes = $attributes;
         $this->types = $types;
@@ -30,11 +31,11 @@ class Catch_ extends Node\Stmt {
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames(): array {
+    public function getSubNodeNames() : array {
         return ['types', 'var', 'stmts'];
     }
 
-    public function getType(): string {
+    public function getType() : string {
         return 'Stmt_Catch';
     }
 }