diff --git a/rules/CodingStyle/ClassNameImport/ShortNameResolver.php b/rules/CodingStyle/ClassNameImport/ShortNameResolver.php index abbd397785b..c3e46b816f8 100644 --- a/rules/CodingStyle/ClassNameImport/ShortNameResolver.php +++ b/rules/CodingStyle/ClassNameImport/ShortNameResolver.php @@ -99,7 +99,7 @@ final class ShortNameResolver public function resolveShortClassLikeNames(File $file) : array { $newStmts = $file->getNewStmts(); - /** @var Namespace_[] $namespaces */ + /** @var Namespace_[]|FileWithoutNamespace[] $namespaces */ $namespaces = \array_filter($newStmts, static function (Stmt $stmt) : bool { return $stmt instanceof Namespace_ || $stmt instanceof FileWithoutNamespace; }); @@ -109,7 +109,7 @@ final class ShortNameResolver } $namespace = \current($namespaces); /** @var ClassLike[] $classLikes */ - $classLikes = $this->betterNodeFinder->findInstanceOf($namespace, ClassLike::class); + $classLikes = $this->betterNodeFinder->findInstanceOf($namespace->stmts, ClassLike::class); $shortClassLikeNames = []; foreach ($classLikes as $classLike) { $shortClassLikeNames[] = $this->nodeNameResolver->getShortName($classLike); diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index bb8a6d0dbb2..0ccb12c6054 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 = '4f199368893906bf5d9f89b936e97297888de463'; + public const PACKAGE_VERSION = 'e38909dbc086a70e5564e21d8af87aab9c1dc62d'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-09-24 16:49:08'; + public const RELEASE_DATE = '2023-09-24 17:03:15'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 002edaa3a3a..dacd2a4073c 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 ComposerAutoloaderInit635741106b572cb4bc1135212680fb0e::getLoader(); +return ComposerAutoloaderInit83c677e729f90f318b811e46e01b4ae0::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index c93864c0b4b..ef65b21a3dd 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit635741106b572cb4bc1135212680fb0e +class ComposerAutoloaderInit83c677e729f90f318b811e46e01b4ae0 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit635741106b572cb4bc1135212680fb0e return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit635741106b572cb4bc1135212680fb0e', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit83c677e729f90f318b811e46e01b4ae0', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit635741106b572cb4bc1135212680fb0e', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit83c677e729f90f318b811e46e01b4ae0', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit635741106b572cb4bc1135212680fb0e::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit83c677e729f90f318b811e46e01b4ae0::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit635741106b572cb4bc1135212680fb0e::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit83c677e729f90f318b811e46e01b4ae0::$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 c69b2311f2b..6f74f7b33db 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit635741106b572cb4bc1135212680fb0e +class ComposerStaticInit83c677e729f90f318b811e46e01b4ae0 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -2601,9 +2601,9 @@ class ComposerStaticInit635741106b572cb4bc1135212680fb0e public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit635741106b572cb4bc1135212680fb0e::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit635741106b572cb4bc1135212680fb0e::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit635741106b572cb4bc1135212680fb0e::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit83c677e729f90f318b811e46e01b4ae0::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit83c677e729f90f318b811e46e01b4ae0::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit83c677e729f90f318b811e46e01b4ae0::$classMap; }, null, ClassLoader::class); }