@appthreat/atom 1.8.1 → 1.8.2

package/plugins/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php

@@ -2,23 +2,22 @@
 
 namespace PhpParser\Internal;
 
-use PhpParser\Token;
-
 /**
  * Provides operations on token streams, for use by pretty printer.
  *
  * @internal
  */
-class TokenStream {
-    /** @var Token[] Tokens (in PhpToken::tokenize() format) */
-    private array $tokens;
+class TokenStream
+{
+    /** @var array Tokens (in token_get_all format) */
+    private $tokens;
     /** @var int[] Map from position to indentation */
-    private array $indentMap;
+    private $indentMap;
 
     /**
      * Create token stream instance.
      *
-     * @param Token[] $tokens Tokens in PhpToken::tokenize() format
+     * @param array $tokens Tokens in token_get_all() format
      */
     public function __construct(array $tokens) {
         $this->tokens = $tokens;
@@ -29,9 +28,11 @@ class TokenStream {
      * Whether the given position is immediately surrounded by parenthesis.
      *
      * @param int $startPos Start position
-     * @param int $endPos End position
+     * @param int $endPos   End position
+     *
+     * @return bool
      */
-    public function haveParens(int $startPos, int $endPos): bool {
+    public function haveParens(int $startPos, int $endPos) : bool {
         return $this->haveTokenImmediatelyBefore($startPos, '(')
             && $this->haveTokenImmediatelyAfter($endPos, ')');
     }
@@ -40,9 +41,11 @@ class TokenStream {
      * Whether the given position is immediately surrounded by braces.
      *
      * @param int $startPos Start position
-     * @param int $endPos End position
+     * @param int $endPos   End position
+     *
+     * @return bool
      */
-    public function haveBraces(int $startPos, int $endPos): bool {
+    public function haveBraces(int $startPos, int $endPos) : bool {
         return ($this->haveTokenImmediatelyBefore($startPos, '{')
                 || $this->haveTokenImmediatelyBefore($startPos, T_CURLY_OPEN))
             && $this->haveTokenImmediatelyAfter($endPos, '}');
@@ -53,20 +56,21 @@ class TokenStream {
      *
      * During this check whitespace and comments are skipped.
      *
-     * @param int $pos Position before which the token should occur
+     * @param int        $pos               Position before which the token should occur
      * @param int|string $expectedTokenType Token to check for
      *
      * @return bool Whether the expected token was found
      */
-    public function haveTokenImmediatelyBefore(int $pos, $expectedTokenType): bool {
+    public function haveTokenImmediatelyBefore(int $pos, $expectedTokenType) : bool {
         $tokens = $this->tokens;
         $pos--;
         for (; $pos >= 0; $pos--) {
-            $token = $tokens[$pos];
-            if ($token->is($expectedTokenType)) {
+            $tokenType = $tokens[$pos][0];
+            if ($tokenType === $expectedTokenType) {
                 return true;
             }
-            if (!$token->isIgnorable()) {
+            if ($tokenType !== \T_WHITESPACE
+                && $tokenType !== \T_COMMENT && $tokenType !== \T_DOC_COMMENT) {
                 break;
             }
         }
@@ -78,28 +82,28 @@ class TokenStream {
      *
      * During this check whitespace and comments are skipped.
      *
-     * @param int $pos Position after which the token should occur
+     * @param int        $pos               Position after which the token should occur
      * @param int|string $expectedTokenType Token to check for
      *
      * @return bool Whether the expected token was found
      */
-    public function haveTokenImmediatelyAfter(int $pos, $expectedTokenType): bool {
+    public function haveTokenImmediatelyAfter(int $pos, $expectedTokenType) : bool {
         $tokens = $this->tokens;
         $pos++;
-        for ($c = \count($tokens); $pos < $c; $pos++) {
-            $token = $tokens[$pos];
-            if ($token->is($expectedTokenType)) {
+        for (; $pos < \count($tokens); $pos++) {
+            $tokenType = $tokens[$pos][0];
+            if ($tokenType === $expectedTokenType) {
                 return true;
             }
-            if (!$token->isIgnorable()) {
+            if ($tokenType !== \T_WHITESPACE
+                && $tokenType !== \T_COMMENT && $tokenType !== \T_DOC_COMMENT) {
                 break;
             }
         }
         return false;
     }
 
-    /** @param int|string|(int|string)[] $skipTokenType */
-    public function skipLeft(int $pos, $skipTokenType): int {
+    public function skipLeft(int $pos, $skipTokenType) {
         $tokens = $this->tokens;
 
         $pos = $this->skipLeftWhitespace($pos);
@@ -107,7 +111,7 @@ class TokenStream {
             return $pos;
         }
 
-        if (!$tokens[$pos]->is($skipTokenType)) {
+        if ($tokens[$pos][0] !== $skipTokenType) {
             // Shouldn't happen. The skip token MUST be there
             throw new \Exception('Encountered unexpected token');
         }
@@ -116,8 +120,7 @@ class TokenStream {
         return $this->skipLeftWhitespace($pos);
     }
 
-    /** @param int|string|(int|string)[] $skipTokenType */
-    public function skipRight(int $pos, $skipTokenType): int {
+    public function skipRight(int $pos, $skipTokenType) {
         $tokens = $this->tokens;
 
         $pos = $this->skipRightWhitespace($pos);
@@ -125,7 +128,7 @@ class TokenStream {
             return $pos;
         }
 
-        if (!$tokens[$pos]->is($skipTokenType)) {
+        if ($tokens[$pos][0] !== $skipTokenType) {
             // Shouldn't happen. The skip token MUST be there
             throw new \Exception('Encountered unexpected token');
         }
@@ -140,10 +143,11 @@ class TokenStream {
      * @param int $pos Token position
      * @return int Non-whitespace token position
      */
-    public function skipLeftWhitespace(int $pos): int {
+    public function skipLeftWhitespace(int $pos) {
         $tokens = $this->tokens;
         for (; $pos >= 0; $pos--) {
-            if (!$tokens[$pos]->isIgnorable()) {
+            $type = $tokens[$pos][0];
+            if ($type !== \T_WHITESPACE && $type !== \T_COMMENT && $type !== \T_DOC_COMMENT) {
                 break;
             }
         }
@@ -156,21 +160,22 @@ class TokenStream {
      * @param int $pos Token position
      * @return int Non-whitespace token position
      */
-    public function skipRightWhitespace(int $pos): int {
+    public function skipRightWhitespace(int $pos) {
         $tokens = $this->tokens;
         for ($count = \count($tokens); $pos < $count; $pos++) {
-            if (!$tokens[$pos]->isIgnorable()) {
+            $type = $tokens[$pos][0];
+            if ($type !== \T_WHITESPACE && $type !== \T_COMMENT && $type !== \T_DOC_COMMENT) {
                 break;
             }
         }
         return $pos;
     }
 
-    /** @param int|string|(int|string)[] $findTokenType */
-    public function findRight(int $pos, $findTokenType): int {
+    public function findRight(int $pos, $findTokenType) {
         $tokens = $this->tokens;
         for ($count = \count($tokens); $pos < $count; $pos++) {
-            if ($tokens[$pos]->is($findTokenType)) {
+            $type = $tokens[$pos][0];
+            if ($type === $findTokenType) {
                 return $pos;
             }
         }
@@ -185,16 +190,22 @@ class TokenStream {
      * @param int|string $tokenType Token type to look for
      * @return bool Whether the token occurs in the given range
      */
-    public function haveTokenInRange(int $startPos, int $endPos, $tokenType): bool {
+    public function haveTokenInRange(int $startPos, int $endPos, $tokenType) {
         $tokens = $this->tokens;
         for ($pos = $startPos; $pos < $endPos; $pos++) {
-            if ($tokens[$pos]->is($tokenType)) {
+            if ($tokens[$pos][0] === $tokenType) {
                 return true;
             }
         }
         return false;
     }
 
+    public function haveBracesInRange(int $startPos, int $endPos) {
+        return $this->haveTokenInRange($startPos, $endPos, '{')
+            || $this->haveTokenInRange($startPos, $endPos, T_CURLY_OPEN)
+            || $this->haveTokenInRange($startPos, $endPos, '}');
+    }
+
     public function haveTagInRange(int $startPos, int $endPos): bool {
         return $this->haveTokenInRange($startPos, $endPos, \T_OPEN_TAG)
             || $this->haveTokenInRange($startPos, $endPos, \T_CLOSE_TAG);
@@ -207,37 +218,41 @@ class TokenStream {
      *
      * @return int Indentation depth (in spaces)
      */
-    public function getIndentationBefore(int $pos): int {
+    public function getIndentationBefore(int $pos) : int {
         return $this->indentMap[$pos];
     }
 
     /**
      * Get the code corresponding to a token offset range, optionally adjusted for indentation.
      *
-     * @param int $from Token start position (inclusive)
-     * @param int $to Token end position (exclusive)
+     * @param int $from   Token start position (inclusive)
+     * @param int $to     Token end position (exclusive)
      * @param int $indent By how much the code should be indented (can be negative as well)
      *
      * @return string Code corresponding to token range, adjusted for indentation
      */
-    public function getTokenCode(int $from, int $to, int $indent): string {
+    public function getTokenCode(int $from, int $to, int $indent) : string {
         $tokens = $this->tokens;
         $result = '';
         for ($pos = $from; $pos < $to; $pos++) {
             $token = $tokens[$pos];
-            $id = $token->id;
-            $text = $token->text;
-            if ($id === \T_CONSTANT_ENCAPSED_STRING || $id === \T_ENCAPSED_AND_WHITESPACE) {
-                $result .= $text;
-            } else {
-                // TODO Handle non-space indentation
-                if ($indent < 0) {
-                    $result .= str_replace("\n" . str_repeat(" ", -$indent), "\n", $text);
-                } elseif ($indent > 0) {
-                    $result .= str_replace("\n", "\n" . str_repeat(" ", $indent), $text);
+            if (\is_array($token)) {
+                $type = $token[0];
+                $content = $token[1];
+                if ($type === \T_CONSTANT_ENCAPSED_STRING || $type === \T_ENCAPSED_AND_WHITESPACE) {
+                    $result .= $content;
                 } else {
-                    $result .= $text;
+                    // TODO Handle non-space indentation
+                    if ($indent < 0) {
+                        $result .= str_replace("\n" . str_repeat(" ", -$indent), "\n", $content);
+                    } elseif ($indent > 0) {
+                        $result .= str_replace("\n", "\n" . str_repeat(" ", $indent), $content);
+                    } else {
+                        $result .= $content;
+                    }
                 }
+            } else {
+                $result .= $token;
             }
         }
         return $result;
@@ -248,14 +263,14 @@ class TokenStream {
      *
      * @return int[] Token position to indentation map
      */
-    private function calcIndentMap(): array {
+    private function calcIndentMap() {
         $indentMap = [];
         $indent = 0;
         foreach ($this->tokens as $token) {
             $indentMap[] = $indent;
 
-            if ($token->id === \T_WHITESPACE) {
-                $content = $token->text;
+            if ($token[0] === \T_WHITESPACE) {
+                $content = $token[1];
                 $newlinePos = \strrpos($content, "\n");
                 if (false !== $newlinePos) {
                     $indent = \strlen($content) - $newlinePos - 1;

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

@@ -2,11 +2,11 @@
 
 namespace PhpParser;
 
-class JsonDecoder {
-    /** @var \ReflectionClass<Node>[] Node type to reflection class map */
-    private array $reflectionClassCache;
+class JsonDecoder
+{
+    /** @var \ReflectionClass[] Node type to reflection class map */
+    private $reflectionClassCache;
 
-    /** @return mixed */
     public function decode(string $json) {
         $value = json_decode($json, true);
         if (json_last_error()) {
@@ -16,10 +16,6 @@ class JsonDecoder {
         return $this->decodeRecursive($value);
     }
 
-    /**
-     * @param mixed $value
-     * @return mixed
-     */
     private function decodeRecursive($value) {
         if (\is_array($value)) {
             if (isset($value['nodeType'])) {
@@ -33,7 +29,7 @@ class JsonDecoder {
         return $value;
     }
 
-    private function decodeArray(array $array): array {
+    private function decodeArray(array $array) : array {
         $decodedArray = [];
         foreach ($array as $key => $value) {
             $decodedArray[$key] = $this->decodeRecursive($value);
@@ -41,13 +37,14 @@ class JsonDecoder {
         return $decodedArray;
     }
 
-    private function decodeNode(array $value): Node {
+    private function decodeNode(array $value) : Node {
         $nodeType = $value['nodeType'];
         if (!\is_string($nodeType)) {
             throw new \RuntimeException('Node type must be a string');
         }
 
         $reflectionClass = $this->reflectionClassFromNodeType($nodeType);
+        /** @var Node $node */
         $node = $reflectionClass->newInstanceWithoutConstructor();
 
         if (isset($value['attributes'])) {
@@ -69,7 +66,7 @@ class JsonDecoder {
         return $node;
     }
 
-    private function decodeComment(array $value): Comment {
+    private function decodeComment(array $value) : Comment {
         $className = $value['nodeType'] === 'Comment' ? Comment::class : Comment\Doc::class;
         if (!isset($value['text'])) {
             throw new \RuntimeException('Comment must have text');
@@ -82,8 +79,7 @@ class JsonDecoder {
         );
     }
 
-    /** @return \ReflectionClass<Node> */
-    private function reflectionClassFromNodeType(string $nodeType): \ReflectionClass {
+    private function reflectionClassFromNodeType(string $nodeType) : \ReflectionClass {
         if (!isset($this->reflectionClassCache[$nodeType])) {
             $className = $this->classNameFromNodeType($nodeType);
             $this->reflectionClassCache[$nodeType] = new \ReflectionClass($className);
@@ -91,8 +87,7 @@ class JsonDecoder {
         return $this->reflectionClassCache[$nodeType];
     }
 
-    /** @return class-string<Node> */
-    private function classNameFromNodeType(string $nodeType): string {
+    private function classNameFromNodeType(string $nodeType) : string {
         $className = 'PhpParser\\Node\\' . strtr($nodeType, '_', '\\');
         if (class_exists($className)) {
             return $className;

package/plugins/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php

@@ -18,29 +18,42 @@ use PhpParser\Lexer\TokenEmulator\ReadonlyFunctionTokenEmulator;
 use PhpParser\Lexer\TokenEmulator\ReadonlyTokenEmulator;
 use PhpParser\Lexer\TokenEmulator\ReverseEmulator;
 use PhpParser\Lexer\TokenEmulator\TokenEmulator;
-use PhpParser\PhpVersion;
-use PhpParser\Token;
 
-class Emulative extends Lexer {
-    /** @var array{int, string, string}[] Patches used to reverse changes introduced in the code */
-    private array $patches = [];
+class Emulative extends Lexer
+{
+    const PHP_7_3 = '7.3dev';
+    const PHP_7_4 = '7.4dev';
+    const PHP_8_0 = '8.0dev';
+    const PHP_8_1 = '8.1dev';
+    const PHP_8_2 = '8.2dev';
 
-    /** @var list<TokenEmulator> */
-    private array $emulators = [];
+    /** @var mixed[] Patches used to reverse changes introduced in the code */
+    private $patches = [];
 
-    private PhpVersion $targetPhpVersion;
+    /** @var TokenEmulator[] */
+    private $emulators = [];
 
-    private PhpVersion $hostPhpVersion;
+    /** @var string */
+    private $targetPhpVersion;
 
     /**
-     * @param PhpVersion|null $phpVersion PHP version to emulate. Defaults to newest supported.
+     * @param mixed[] $options Lexer options. In addition to the usual options,
+     *                         accepts a 'phpVersion' string that specifies the
+     *                         version to emulate. Defaults to newest supported.
      */
-    public function __construct(?PhpVersion $phpVersion = null) {
-        $this->targetPhpVersion = $phpVersion ?? PhpVersion::getNewestSupported();
-        $this->hostPhpVersion = PhpVersion::getHostVersion();
+    public function __construct(array $options = [])
+    {
+        $this->targetPhpVersion = $options['phpVersion'] ?? Emulative::PHP_8_2;
+        unset($options['phpVersion']);
+
+        parent::__construct($options);
 
         $emulators = [
+            new FlexibleDocStringEmulator(),
+            new FnTokenEmulator(),
             new MatchTokenEmulator(),
+            new CoaleseEqualTokenEmulator(),
+            new NumericLiteralSeparatorEmulator(),
             new NullsafeTokenEmulator(),
             new AttributeEmulator(),
             new EnumTokenEmulator(),
@@ -55,24 +68,21 @@ class Emulative extends Lexer {
             $emulatorPhpVersion = $emulator->getPhpVersion();
             if ($this->isForwardEmulationNeeded($emulatorPhpVersion)) {
                 $this->emulators[] = $emulator;
-            } elseif ($this->isReverseEmulationNeeded($emulatorPhpVersion)) {
+            } else if ($this->isReverseEmulationNeeded($emulatorPhpVersion)) {
                 $this->emulators[] = new ReverseEmulator($emulator);
             }
         }
     }
 
-    public function tokenize(string $code, ?ErrorHandler $errorHandler = null): array {
-        $emulators = array_filter($this->emulators, function ($emulator) use ($code) {
+    public function startLexing(string $code, ErrorHandler $errorHandler = null) {
+        $emulators = array_filter($this->emulators, function($emulator) use($code) {
             return $emulator->isEmulationNeeded($code);
         });
 
         if (empty($emulators)) {
             // Nothing to emulate, yay
-            return parent::tokenize($code, $errorHandler);
-        }
-
-        if ($errorHandler === null) {
-            $errorHandler = new ErrorHandler\Throwing();
+            parent::startLexing($code, $errorHandler);
+            return;
         }
 
         $this->patches = [];
@@ -81,9 +91,9 @@ class Emulative extends Lexer {
         }
 
         $collector = new ErrorHandler\Collecting();
-        $tokens = parent::tokenize($code, $collector);
+        parent::startLexing($code, $collector);
         $this->sortPatches();
-        $tokens = $this->fixupTokens($tokens);
+        $this->fixupTokens();
 
         $errors = $collector->getErrors();
         if (!empty($errors)) {
@@ -94,80 +104,90 @@ class Emulative extends Lexer {
         }
 
         foreach ($emulators as $emulator) {
-            $tokens = $emulator->emulate($code, $tokens);
+            $this->tokens = $emulator->emulate($code, $this->tokens);
         }
-
-        return $tokens;
     }
 
-    private function isForwardEmulationNeeded(PhpVersion $emulatorPhpVersion): bool {
-        return $this->hostPhpVersion->older($emulatorPhpVersion)
-            && $this->targetPhpVersion->newerOrEqual($emulatorPhpVersion);
+    private function isForwardEmulationNeeded(string $emulatorPhpVersion): bool {
+        return version_compare(\PHP_VERSION, $emulatorPhpVersion, '<')
+            && version_compare($this->targetPhpVersion, $emulatorPhpVersion, '>=');
     }
 
-    private function isReverseEmulationNeeded(PhpVersion $emulatorPhpVersion): bool {
-        return $this->hostPhpVersion->newerOrEqual($emulatorPhpVersion)
-            && $this->targetPhpVersion->older($emulatorPhpVersion);
+    private function isReverseEmulationNeeded(string $emulatorPhpVersion): bool {
+        return version_compare(\PHP_VERSION, $emulatorPhpVersion, '>=')
+            && version_compare($this->targetPhpVersion, $emulatorPhpVersion, '<');
     }
 
-    private function sortPatches(): void {
+    private function sortPatches()
+    {
         // Patches may be contributed by different emulators.
         // Make sure they are sorted by increasing patch position.
-        usort($this->patches, function ($p1, $p2) {
+        usort($this->patches, function($p1, $p2) {
             return $p1[0] <=> $p2[0];
         });
     }
 
-    /**
-     * @param list<Token> $tokens
-     * @return list<Token>
-     */
-    private function fixupTokens(array $tokens): array {
+    private function fixupTokens()
+    {
         if (\count($this->patches) === 0) {
-            return $tokens;
+            return;
         }
 
         // Load first patch
         $patchIdx = 0;
+
         list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
 
         // We use a manual loop over the tokens, because we modify the array on the fly
-        $posDelta = 0;
-        $lineDelta = 0;
-        for ($i = 0, $c = \count($tokens); $i < $c; $i++) {
-            $token = $tokens[$i];
-            $pos = $token->pos;
-            $token->pos += $posDelta;
-            $token->line += $lineDelta;
-            $localPosDelta = 0;
-            $len = \strlen($token->text);
+        $pos = 0;
+        for ($i = 0, $c = \count($this->tokens); $i < $c; $i++) {
+            $token = $this->tokens[$i];
+            if (\is_string($token)) {
+                if ($patchPos === $pos) {
+                    // Only support replacement for string tokens.
+                    assert($patchType === 'replace');
+                    $this->tokens[$i] = $patchText;
+
+                    // Fetch the next patch
+                    $patchIdx++;
+                    if ($patchIdx >= \count($this->patches)) {
+                        // No more patches, we're done
+                        return;
+                    }
+                    list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
+                }
+
+                $pos += \strlen($token);
+                continue;
+            }
+
+            $len = \strlen($token[1]);
+            $posDelta = 0;
             while ($patchPos >= $pos && $patchPos < $pos + $len) {
                 $patchTextLen = \strlen($patchText);
                 if ($patchType === 'remove') {
                     if ($patchPos === $pos && $patchTextLen === $len) {
                         // Remove token entirely
-                        array_splice($tokens, $i, 1, []);
+                        array_splice($this->tokens, $i, 1, []);
                         $i--;
                         $c--;
                     } else {
                         // Remove from token string
-                        $token->text = substr_replace(
-                            $token->text, '', $patchPos - $pos + $localPosDelta, $patchTextLen
+                        $this->tokens[$i][1] = substr_replace(
+                            $token[1], '', $patchPos - $pos + $posDelta, $patchTextLen
                         );
-                        $localPosDelta -= $patchTextLen;
+                        $posDelta -= $patchTextLen;
                     }
-                    $lineDelta -= \substr_count($patchText, "\n");
                 } elseif ($patchType === 'add') {
                     // Insert into the token string
-                    $token->text = substr_replace(
-                        $token->text, $patchText, $patchPos - $pos + $localPosDelta, 0
+                    $this->tokens[$i][1] = substr_replace(
+                        $token[1], $patchText, $patchPos - $pos + $posDelta, 0
                     );
-                    $localPosDelta += $patchTextLen;
-                    $lineDelta += \substr_count($patchText, "\n");
-                } elseif ($patchType === 'replace') {
+                    $posDelta += $patchTextLen;
+                } else if ($patchType === 'replace') {
                     // Replace inside the token string
-                    $token->text = substr_replace(
-                        $token->text, $patchText, $patchPos - $pos + $localPosDelta, $patchTextLen
+                    $this->tokens[$i][1] = substr_replace(
+                        $token[1], $patchText, $patchPos - $pos + $posDelta, $patchTextLen
                     );
                 } else {
                     assert(false);
@@ -176,17 +196,22 @@ class Emulative extends Lexer {
                 // Fetch the next patch
                 $patchIdx++;
                 if ($patchIdx >= \count($this->patches)) {
-                    // No more patches. However, we still need to adjust position.
-                    $patchPos = \PHP_INT_MAX;
-                    break;
+                    // No more patches, we're done
+                    return;
                 }
 
                 list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
+
+                // Multiple patches may apply to the same token. Reload the current one to check
+                // If the new patch applies
+                $token = $this->tokens[$i];
             }
 
-            $posDelta += $localPosDelta;
+            $pos += $len;
         }
-        return $tokens;
+
+        // A patch did not apply
+        assert(false);
     }
 
     /**
@@ -194,7 +219,7 @@ class Emulative extends Lexer {
      *
      * @param Error[] $errors
      */
-    private function fixupErrors(array $errors): void {
+    private function fixupErrors(array $errors) {
         foreach ($errors as $error) {
             $attrs = $error->getAttributes();
 
@@ -210,7 +235,7 @@ class Emulative extends Lexer {
                 if ($patchType === 'add') {
                     $posDelta += strlen($patchText);
                     $lineDelta += substr_count($patchText, "\n");
-                } elseif ($patchType === 'remove') {
+                } else if ($patchType === 'remove') {
                     $posDelta -= strlen($patchText);
                     $lineDelta -= substr_count($patchText, "\n");
                 }