diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 182ebc89a05..0f6aef87b95 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = '6e88b21cfdbf459d4c2b4c97c0db2c9b2d90b572'; + public const PACKAGE_VERSION = '8f3569e84677b4a29feb0af0788a0156086f921f'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-05-22 14:33:41'; + public const RELEASE_DATE = '2023-05-23 01:55:14'; /** * @var int */ diff --git a/src/PhpParser/Node/BetterNodeFinder.php b/src/PhpParser/Node/BetterNodeFinder.php index 5470ff1070a..8d056f87a16 100644 --- a/src/PhpParser/Node/BetterNodeFinder.php +++ b/src/PhpParser/Node/BetterNodeFinder.php @@ -551,7 +551,11 @@ final class BetterNodeFinder private function resolveNeighborNextStmt($stmtsAware, Stmt $stmt, int $key) : ?Node { if (!isset($stmtsAware->stmts[$key - 1])) { - return $stmtsAware->stmts[$key + 1] ?? null; + $nextNode = $stmtsAware->stmts[$key + 1] ?? null; + if ($nextNode instanceof Stmt && $nextNode->getStartTokenPos() < 0) { + return $this->resolveNeighborNextStmt($stmtsAware, $nextNode, $key + 1); + } + return $nextNode; } $startTokenPos = $stmt->getStartTokenPos(); if ($stmtsAware->stmts[$key - 1]->getStartTokenPos() !== $startTokenPos) { diff --git a/vendor/autoload.php b/vendor/autoload.php index f206f6a6de0..b6a4b73e61e 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit6cdbfadb270320cddd4897ea8aa9810a::getLoader(); +return ComposerAutoloaderInitbd1c9a152ba5ac575455804a7122ce5f::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 31ae120cb9f..8607e9c22e6 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit6cdbfadb270320cddd4897ea8aa9810a +class ComposerAutoloaderInitbd1c9a152ba5ac575455804a7122ce5f { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit6cdbfadb270320cddd4897ea8aa9810a return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit6cdbfadb270320cddd4897ea8aa9810a', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitbd1c9a152ba5ac575455804a7122ce5f', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit6cdbfadb270320cddd4897ea8aa9810a', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitbd1c9a152ba5ac575455804a7122ce5f', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit6cdbfadb270320cddd4897ea8aa9810a::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitbd1c9a152ba5ac575455804a7122ce5f::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit6cdbfadb270320cddd4897ea8aa9810a::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInitbd1c9a152ba5ac575455804a7122ce5f::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index d5c6e202b41..c3f8a8f473d 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit6cdbfadb270320cddd4897ea8aa9810a +class ComposerStaticInitbd1c9a152ba5ac575455804a7122ce5f { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3111,9 +3111,9 @@ class ComposerStaticInit6cdbfadb270320cddd4897ea8aa9810a public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit6cdbfadb270320cddd4897ea8aa9810a::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit6cdbfadb270320cddd4897ea8aa9810a::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit6cdbfadb270320cddd4897ea8aa9810a::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitbd1c9a152ba5ac575455804a7122ce5f::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitbd1c9a152ba5ac575455804a7122ce5f::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitbd1c9a152ba5ac575455804a7122ce5f::$classMap; }, null, ClassLoader::class); }