@appthreat/atom-parsetools 1.0.11 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom-parsetools",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Parsing tools that complement the @appthreat/atom project.",
   "main": "./index.js",
   "type": "module",
@@ -9,9 +9,9 @@
     "lint": "eslint *.mjs *.js"
   },
   "dependencies": {
-    "@appthreat/atom-common": "^1.0.11",
-    "@babel/parser": "^7.28.4",
-    "typescript": "^5.9.2",
+    "@appthreat/atom-common": "^1.0.13",
+    "@babel/parser": "^7.28.5",
+    "typescript": "^5.9.3",
     "yargs": "^17.7.2"
   },
   "devDependencies": {

package/plugins/autoload.php

@@ -19,4 +19,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit07f15f165bc4416460255d4dcdb3e2c7::getLoader();
+return ComposerAutoloaderInitd7e37b2ee70cda83d020f124a964979e::getLoader();

package/plugins/bin/ruby_ast_gen

@@ -11,4 +11,4 @@
 $:.unshift File.expand_path "../rubyastgen/bundle", __dir__
 
 require "bundler/setup"
-load File.expand_path "../rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-8738b155eb4f/exe/ruby_ast_gen", __dir__
+load File.expand_path "../rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-e7cf7549b7ea/exe/ruby_ast_gen", __dir__

package/plugins/composer/autoload_classmap.php

@@ -49,11 +49,13 @@ return array(
     'PhpParser\\Lexer\\TokenEmulator\\KeywordEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php',
     'PhpParser\\Lexer\\TokenEmulator\\MatchTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php',
     'PhpParser\\Lexer\\TokenEmulator\\NullsafeTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\PipeOperatorEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/PipeOperatorEmulator.php',
     'PhpParser\\Lexer\\TokenEmulator\\PropertyTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/PropertyTokenEmulator.php',
     'PhpParser\\Lexer\\TokenEmulator\\ReadonlyFunctionTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyFunctionTokenEmulator.php',
     'PhpParser\\Lexer\\TokenEmulator\\ReadonlyTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php',
     'PhpParser\\Lexer\\TokenEmulator\\ReverseEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php',
     'PhpParser\\Lexer\\TokenEmulator\\TokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\VoidCastEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/VoidCastEmulator.php',
     'PhpParser\\Modifiers' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Modifiers.php',
     'PhpParser\\NameContext' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NameContext.php',
     'PhpParser\\Node' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node.php',
@@ -121,6 +123,7 @@ return array(
     'PhpParser\\Node\\Expr\\BinaryOp\\Mul' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mul.php',
     'PhpParser\\Node\\Expr\\BinaryOp\\NotEqual' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotEqual.php',
     'PhpParser\\Node\\Expr\\BinaryOp\\NotIdentical' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotIdentical.php',
+    'PhpParser\\Node\\Expr\\BinaryOp\\Pipe' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pipe.php',
     'PhpParser\\Node\\Expr\\BinaryOp\\Plus' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Plus.php',
     'PhpParser\\Node\\Expr\\BinaryOp\\Pow' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pow.php',
     'PhpParser\\Node\\Expr\\BinaryOp\\ShiftLeft' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftLeft.php',
@@ -139,6 +142,7 @@ return array(
     'PhpParser\\Node\\Expr\\Cast\\Object_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Object_.php',
     'PhpParser\\Node\\Expr\\Cast\\String_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/String_.php',
     'PhpParser\\Node\\Expr\\Cast\\Unset_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Unset_.php',
+    'PhpParser\\Node\\Expr\\Cast\\Void_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Void_.php',
     'PhpParser\\Node\\Expr\\ClassConstFetch' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php',
     'PhpParser\\Node\\Expr\\Clone_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php',
     'PhpParser\\Node\\Expr\\Closure' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php',

package/plugins/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit07f15f165bc4416460255d4dcdb3e2c7
+class ComposerAutoloaderInitd7e37b2ee70cda83d020f124a964979e
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInit07f15f165bc4416460255d4dcdb3e2c7
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit07f15f165bc4416460255d4dcdb3e2c7', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitd7e37b2ee70cda83d020f124a964979e', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit07f15f165bc4416460255d4dcdb3e2c7', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitd7e37b2ee70cda83d020f124a964979e', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit07f15f165bc4416460255d4dcdb3e2c7::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitd7e37b2ee70cda83d020f124a964979e::getInitializer($loader));
 
         $loader->register(true);
 

package/plugins/composer/autoload_static.php

@@ -4,17 +4,17 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit07f15f165bc4416460255d4dcdb3e2c7
+class ComposerStaticInitd7e37b2ee70cda83d020f124a964979e
 {
     public static $prefixLengthsPsr4 = array (
-        'P' => 
+        'P' =>
         array (
             'PhpParser\\' => 10,
         ),
     );
 
     public static $prefixDirsPsr4 = array (
-        'PhpParser\\' => 
+        'PhpParser\\' =>
         array (
             0 => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser',
         ),
@@ -64,11 +64,13 @@ class ComposerStaticInit07f15f165bc4416460255d4dcdb3e2c7
         'PhpParser\\Lexer\\TokenEmulator\\KeywordEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php',
         'PhpParser\\Lexer\\TokenEmulator\\MatchTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php',
         'PhpParser\\Lexer\\TokenEmulator\\NullsafeTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\PipeOperatorEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/PipeOperatorEmulator.php',
         'PhpParser\\Lexer\\TokenEmulator\\PropertyTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/PropertyTokenEmulator.php',
         'PhpParser\\Lexer\\TokenEmulator\\ReadonlyFunctionTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyFunctionTokenEmulator.php',
         'PhpParser\\Lexer\\TokenEmulator\\ReadonlyTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php',
         'PhpParser\\Lexer\\TokenEmulator\\ReverseEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php',
         'PhpParser\\Lexer\\TokenEmulator\\TokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\VoidCastEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/VoidCastEmulator.php',
         'PhpParser\\Modifiers' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Modifiers.php',
         'PhpParser\\NameContext' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NameContext.php',
         'PhpParser\\Node' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node.php',
@@ -136,6 +138,7 @@ class ComposerStaticInit07f15f165bc4416460255d4dcdb3e2c7
         'PhpParser\\Node\\Expr\\BinaryOp\\Mul' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mul.php',
         'PhpParser\\Node\\Expr\\BinaryOp\\NotEqual' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotEqual.php',
         'PhpParser\\Node\\Expr\\BinaryOp\\NotIdentical' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotIdentical.php',
+        'PhpParser\\Node\\Expr\\BinaryOp\\Pipe' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pipe.php',
         'PhpParser\\Node\\Expr\\BinaryOp\\Plus' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Plus.php',
         'PhpParser\\Node\\Expr\\BinaryOp\\Pow' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pow.php',
         'PhpParser\\Node\\Expr\\BinaryOp\\ShiftLeft' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftLeft.php',
@@ -154,6 +157,7 @@ class ComposerStaticInit07f15f165bc4416460255d4dcdb3e2c7
         'PhpParser\\Node\\Expr\\Cast\\Object_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Object_.php',
         'PhpParser\\Node\\Expr\\Cast\\String_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/String_.php',
         'PhpParser\\Node\\Expr\\Cast\\Unset_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Unset_.php',
+        'PhpParser\\Node\\Expr\\Cast\\Void_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Void_.php',
         'PhpParser\\Node\\Expr\\ClassConstFetch' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php',
         'PhpParser\\Node\\Expr\\Clone_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php',
         'PhpParser\\Node\\Expr\\Closure' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php',
@@ -291,9 +295,9 @@ class ComposerStaticInit07f15f165bc4416460255d4dcdb3e2c7
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit07f15f165bc4416460255d4dcdb3e2c7::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit07f15f165bc4416460255d4dcdb3e2c7::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit07f15f165bc4416460255d4dcdb3e2c7::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitd7e37b2ee70cda83d020f124a964979e::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitd7e37b2ee70cda83d020f124a964979e::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitd7e37b2ee70cda83d020f124a964979e::$classMap;
 
         }, null, ClassLoader::class);
     }

package/plugins/composer/installed.json

@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "nikic/php-parser",
-            "version": "v5.5.0",
-            "version_normalized": "5.5.0.0",
+            "version": "v5.6.2",
+            "version_normalized": "5.6.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
+                "reference": "3a454ca033b9e06b63282ce19562e892747449bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
-                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb",
+                "reference": "3a454ca033b9e06b63282ce19562e892747449bb",
                 "shasum": ""
             },
             "require": {
@@ -25,14 +25,14 @@
                 "ircmaxell/php-yacc": "^0.0.7",
                 "phpunit/phpunit": "^9.0"
             },
-            "time": "2025-05-31T08:24:38+00:00",
+            "time": "2025-10-21T19:32:17+00:00",
             "bin": [
                 "bin/php-parse"
             ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.x-dev"
                 }
             },
             "installation-source": "dist",
@@ -57,7 +57,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2"
             },
             "install-path": "../nikic/php-parser"
         }

package/plugins/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'v2.4.2',
-        'version' => '2.4.2.0',
-        'reference' => '81c8c31d2d731f23fc361ff00d09764321b94f31',
+        'pretty_version' => 'v2.4.4',
+        'version' => '2.4.4.0',
+        'reference' => '1dc241047acc51a1fd4d877d615a6589f16eaef9',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,18 +11,18 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'v2.4.2',
-            'version' => '2.4.2.0',
-            'reference' => '81c8c31d2d731f23fc361ff00d09764321b94f31',
+            'pretty_version' => 'v2.4.4',
+            'version' => '2.4.4.0',
+            'reference' => '1dc241047acc51a1fd4d877d615a6589f16eaef9',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'nikic/php-parser' => array(
-            'pretty_version' => 'v5.5.0',
-            'version' => '5.5.0.0',
-            'reference' => 'ae59794362fe85e051a58ad36b289443f57be7a9',
+            'pretty_version' => 'v5.6.2',
+            'version' => '5.6.2.0',
+            'reference' => '3a454ca033b9e06b63282ce19562e892747449bb',
             'type' => 'library',
             'install_path' => __DIR__ . '/../nikic/php-parser',
             'aliases' => array(),

package/plugins/nikic/php-parser/composer.json

@@ -24,7 +24,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.0-dev"
+            "dev-master": "5.x-dev"
         }
     },
     "autoload": {

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

@@ -215,6 +215,9 @@ class ConstExprEvaluator {
             case '<':   return $this->evaluate($l) <   $this->evaluate($r);
             case '<=':  return $this->evaluate($l) <=  $this->evaluate($r);
             case '<=>': return $this->evaluate($l) <=> $this->evaluate($r);
+            case '|>':
+                $lval = $this->evaluate($l);
+                return $this->evaluate($r)($lval);
         }
 
         throw new \Exception('Should not happen');

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

@@ -11,11 +11,13 @@ use PhpParser\Lexer\TokenEmulator\EnumTokenEmulator;
 use PhpParser\Lexer\TokenEmulator\ExplicitOctalEmulator;
 use PhpParser\Lexer\TokenEmulator\MatchTokenEmulator;
 use PhpParser\Lexer\TokenEmulator\NullsafeTokenEmulator;
+use PhpParser\Lexer\TokenEmulator\PipeOperatorEmulator;
 use PhpParser\Lexer\TokenEmulator\PropertyTokenEmulator;
 use PhpParser\Lexer\TokenEmulator\ReadonlyFunctionTokenEmulator;
 use PhpParser\Lexer\TokenEmulator\ReadonlyTokenEmulator;
 use PhpParser\Lexer\TokenEmulator\ReverseEmulator;
 use PhpParser\Lexer\TokenEmulator\TokenEmulator;
+use PhpParser\Lexer\TokenEmulator\VoidCastEmulator;
 use PhpParser\PhpVersion;
 use PhpParser\Token;
 
@@ -47,6 +49,8 @@ class Emulative extends Lexer {
             new ReadonlyFunctionTokenEmulator(),
             new PropertyTokenEmulator(),
             new AsymmetricVisibilityTokenEmulator(),
+            new PipeOperatorEmulator(),
+            new VoidCastEmulator(),
         ];
 
         // Collect emulators that are relevant for the PHP version we're running

package/plugins/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/PipeOperatorEmulator.php

@@ -0,0 +1,45 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\Lexer\TokenEmulator\TokenEmulator;
+use PhpParser\PhpVersion;
+use PhpParser\Token;
+
+class PipeOperatorEmulator extends TokenEmulator {
+    public function getPhpVersion(): PhpVersion {
+        return PhpVersion::fromComponents(8, 5);
+    }
+
+    public function isEmulationNeeded(string $code): bool {
+        return \strpos($code, '|>') !== false;
+    }
+
+    public function emulate(string $code, array $tokens): array {
+        for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
+            $token = $tokens[$i];
+            if ($token->text === '|' && isset($tokens[$i + 1]) && $tokens[$i + 1]->text === '>') {
+                array_splice($tokens, $i, 2, [
+                    new Token(\T_PIPE, '|>', $token->line, $token->pos),
+                ]);
+                $c--;
+            }
+        }
+        return $tokens;
+    }
+
+    public function reverseEmulate(string $code, array $tokens): array {
+        for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
+            $token = $tokens[$i];
+            if ($token->id === \T_PIPE) {
+                array_splice($tokens, $i, 1, [
+                    new Token(\ord('|'), '|', $token->line, $token->pos),
+                    new Token(\ord('>'), '>', $token->line, $token->pos + 1),
+                ]);
+                $i++;
+                $c++;
+            }
+        }
+        return $tokens;
+    }
+}

package/plugins/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/VoidCastEmulator.php

@@ -0,0 +1,98 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\PhpVersion;
+use PhpParser\Token;
+
+class VoidCastEmulator extends TokenEmulator {
+    public function getPhpVersion(): PhpVersion {
+        return PhpVersion::fromComponents(8, 5);
+    }
+
+    public function isEmulationNeeded(string $code): bool {
+        return (bool)\preg_match('/\([ \t]*void[ \t]*\)/i', $code);
+    }
+
+    public function emulate(string $code, array $tokens): array {
+        for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
+            $token = $tokens[$i];
+            if ($token->text !== '(') {
+                continue;
+            }
+
+            $numTokens = 1;
+            $text = '(';
+            $j = $i + 1;
+            if ($j < $c && $tokens[$j]->id === \T_WHITESPACE && preg_match('/[ \t]+/', $tokens[$j]->text)) {
+                $text .= $tokens[$j]->text;
+                $numTokens++;
+                $j++;
+            }
+
+            if ($j >= $c || $tokens[$j]->id !== \T_STRING || \strtolower($tokens[$j]->text) !== 'void') {
+                continue;
+            }
+
+            $text .= $tokens[$j]->text;
+            $numTokens++;
+            $k = $j + 1;
+            if ($k < $c && $tokens[$k]->id === \T_WHITESPACE && preg_match('/[ \t]+/', $tokens[$k]->text)) {
+                $text .= $tokens[$k]->text;
+                $numTokens++;
+                $k++;
+            }
+
+            if ($k >= $c || $tokens[$k]->text !== ')') {
+                continue;
+            }
+
+            $text .= ')';
+            $numTokens++;
+            array_splice($tokens, $i, $numTokens, [
+                new Token(\T_VOID_CAST, $text, $token->line, $token->pos),
+            ]);
+            $c -= $numTokens - 1;
+        }
+        return $tokens;
+    }
+
+    public function reverseEmulate(string $code, array $tokens): array {
+        for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
+            $token = $tokens[$i];
+            if ($token->id !== \T_VOID_CAST) {
+                continue;
+            }
+
+            if (!preg_match('/^\(([ \t]*)(void)([ \t]*)\)$/i', $token->text, $match)) {
+                throw new \LogicException('Unexpected T_VOID_CAST contents');
+            }
+
+            $newTokens = [];
+            $pos = $token->pos;
+
+            $newTokens[] = new Token(\ord('('), '(', $token->line, $pos);
+            $pos++;
+
+            if ($match[1] !== '') {
+                $newTokens[] = new Token(\T_WHITESPACE, $match[1], $token->line, $pos);
+                $pos += \strlen($match[1]);
+            }
+
+            $newTokens[] = new Token(\T_STRING, $match[2], $token->line, $pos);
+            $pos += \strlen($match[2]);
+
+            if ($match[3] !== '') {
+                $newTokens[] = new Token(\T_WHITESPACE, $match[3], $token->line, $pos);
+                $pos += \strlen($match[3]);
+            }
+
+            $newTokens[] = new Token(\ord(')'), ')', $token->line, $pos);
+
+            array_splice($tokens, $i, 1, $newTokens);
+            $i += \count($newTokens) - 1;
+            $c += \count($newTokens) - 1;
+        }
+        return $tokens;
+    }
+}

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

@@ -5,7 +5,11 @@ namespace PhpParser\Node\Expr;
 require __DIR__ . '/../ArrayItem.php';
 
 if (false) {
-    // For classmap-authoritative support.
+    /**
+     * For classmap-authoritative support.
+     *
+     * @deprecated use \PhpParser\Node\ArrayItem instead.
+     */
     class ArrayItem extends \PhpParser\Node\ArrayItem {
     }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pipe.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr\BinaryOp;
+
+use PhpParser\Node\Expr\BinaryOp;
+
+class Pipe extends BinaryOp {
+    public function getOperatorSigil(): string {
+        return '|>';
+    }
+
+    public function getType(): string {
+        return 'Expr_BinaryOp_Pipe';
+    }
+}

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

@@ -32,4 +32,29 @@ abstract class CallLike extends Expr {
         assert(!$this->isFirstClassCallable());
         return $this->getRawArgs();
     }
+
+    /**
+     * Retrieves a specific argument from the raw arguments.
+     *
+     * Returns the named argument that matches the given `$name`, or the
+     * positional (unnamed) argument that exists at the given `$position`,
+     * otherwise, returns `null` for first-class callables or if no match is found.
+     */
+    public function getArg(string $name, int $position): ?Arg {
+        if ($this->isFirstClassCallable()) {
+            return null;
+        }
+        foreach ($this->getRawArgs() as $i => $arg) {
+            if ($arg->unpack) {
+                continue;
+            }
+            if (
+                ($arg->name !== null && $arg->name->toString() === $name)
+                || ($arg->name === null && $i === $position)
+            ) {
+                return $arg;
+            }
+        }
+        return null;
+    }
 }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Bool_.php

@@ -5,6 +5,10 @@ namespace PhpParser\Node\Expr\Cast;
 use PhpParser\Node\Expr\Cast;
 
 class Bool_ extends Cast {
+    // For use in "kind" attribute
+    public const KIND_BOOL = 1; // "bool" syntax
+    public const KIND_BOOLEAN = 2; // "boolean" syntax
+
     public function getType(): string {
         return 'Expr_Cast_Bool';
     }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Int_.php

@@ -5,6 +5,10 @@ namespace PhpParser\Node\Expr\Cast;
 use PhpParser\Node\Expr\Cast;
 
 class Int_ extends Cast {
+    // For use in "kind" attribute
+    public const KIND_INT = 1; // "int" syntax
+    public const KIND_INTEGER = 2; // "integer" syntax
+
     public function getType(): string {
         return 'Expr_Cast_Int';
     }

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

@@ -5,6 +5,10 @@ namespace PhpParser\Node\Expr\Cast;
 use PhpParser\Node\Expr\Cast;
 
 class String_ extends Cast {
+    // For use in "kind" attribute
+    public const KIND_STRING = 1; // "string" syntax
+    public const KIND_BINARY = 2; // "binary" syntax
+
     public function getType(): string {
         return 'Expr_Cast_String';
     }

package/plugins/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Void_.php

@@ -0,0 +1,11 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr\Cast;
+
+use PhpParser\Node\Expr\Cast;
+
+class Void_ extends Cast {
+    public function getType(): string {
+        return 'Expr_Cast_Void';
+    }
+}

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

@@ -5,7 +5,11 @@ namespace PhpParser\Node\Expr;
 require __DIR__ . '/../ClosureUse.php';
 
 if (false) {
-    // For classmap-authoritative support.
+    /**
+     * For classmap-authoritative support.
+     *
+     * @deprecated use \PhpParser\Node\ClosureUse instead.
+     */
     class ClosureUse extends \PhpParser\Node\ClosureUse {
     }
 }

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

@@ -71,13 +71,17 @@ class Param extends NodeAbstract {
         return $this->flags !== 0 || $this->hooks !== [];
     }
 
+    public function isFinal(): bool {
+        return (bool) ($this->flags & Modifiers::FINAL);
+    }
+
     public function isPublic(): bool {
         $public = (bool) ($this->flags & Modifiers::PUBLIC);
         if ($public) {
             return true;
         }
 
-        if ($this->hooks === []) {
+        if (!$this->isPromoted()) {
             return false;
         }
 

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

@@ -5,7 +5,11 @@ namespace PhpParser\Node\Scalar;
 require __DIR__ . '/Float_.php';
 
 if (false) {
-    // For classmap-authoritative support.
+    /**
+     * For classmap-authoritative support.
+     *
+     * @deprecated use \PhpParser\Node\Scalar\Float_ instead.
+     */
     class DNumber extends Float_ {
     }
 }

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

@@ -5,7 +5,11 @@ namespace PhpParser\Node\Scalar;
 require __DIR__ . '/InterpolatedString.php';
 
 if (false) {
-    // For classmap-authoritative support.
+    /**
+     * For classmap-authoritative support.
+     *
+     * @deprecated use \PhpParser\Node\Scalar\InterpolatedString instead.
+     */
     class Encapsed extends InterpolatedString {
     }
 }

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

@@ -7,7 +7,11 @@ use PhpParser\Node\InterpolatedStringPart;
 require __DIR__ . '/../InterpolatedStringPart.php';
 
 if (false) {
-    // For classmap-authoritative support.
+    /**
+     * For classmap-authoritative support.
+     *
+     * @deprecated use \PhpParser\Node\InterpolatedStringPart instead.
+     */
     class EncapsedStringPart extends InterpolatedStringPart {
     }
 }

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

@@ -5,7 +5,11 @@ namespace PhpParser\Node\Scalar;
 require __DIR__ . '/Int_.php';
 
 if (false) {
-    // For classmap-authoritative support.
+    /**
+     * For classmap-authoritative support.
+     *
+     * @deprecated use \PhpParser\Node\Scalar\Int_ instead.
+     */
     class LNumber extends Int_ {
     }
 }