diff --git a/packages/NodeNameResolver/NodeNameResolver.php b/packages/NodeNameResolver/NodeNameResolver.php index ff56d0caee7..0d9faa77f3f 100644 --- a/packages/NodeNameResolver/NodeNameResolver.php +++ b/packages/NodeNameResolver/NodeNameResolver.php @@ -14,9 +14,7 @@ use PHPStan\Analyser\Scope; use Rector\CodingStyle\Naming\ClassNaming; use Rector\Core\Exception\ShouldNotHappenException; use Rector\Core\NodeAnalyzer\CallAnalyzer; -use Rector\Core\Util\StringUtils; use Rector\NodeNameResolver\Contract\NodeNameResolverInterface; -use Rector\NodeNameResolver\Regex\RegexPatternDetector; use Rector\NodeTypeResolver\Node\AttributeKey; final class NodeNameResolver { @@ -30,11 +28,6 @@ final class NodeNameResolver * @var \Rector\Core\NodeAnalyzer\CallAnalyzer */ private $callAnalyzer; - /** - * @readonly - * @var \Rector\NodeNameResolver\Regex\RegexPatternDetector - */ - private $regexPatternDetector; /** * @var NodeNameResolverInterface[] * @readonly @@ -47,11 +40,10 @@ final class NodeNameResolver /** * @param NodeNameResolverInterface[] $nodeNameResolvers */ - public function __construct(ClassNaming $classNaming, CallAnalyzer $callAnalyzer, RegexPatternDetector $regexPatternDetector, iterable $nodeNameResolvers = []) + public function __construct(ClassNaming $classNaming, CallAnalyzer $callAnalyzer, iterable $nodeNameResolvers = []) { $this->classNaming = $classNaming; $this->callAnalyzer = $callAnalyzer; - $this->regexPatternDetector = $regexPatternDetector; $this->nodeNameResolvers = $nodeNameResolvers; } /** @@ -179,16 +171,7 @@ final class NodeNameResolver if ($desiredName === 'Object') { return $desiredName === $resolvedName; } - if (\strcasecmp($resolvedName, $desiredName) === 0) { - return \true; - } - if ($this->regexPatternDetector->isRegexPattern($desiredName)) { - return StringUtils::isMatch($resolvedName, $desiredName); - } - if (\strpos($desiredName, '*') !== \false) { - return \fnmatch($desiredName, $resolvedName, \FNM_NOESCAPE); - } - return \false; + return \strcasecmp($resolvedName, $desiredName) === 0; } /** * @param \PhpParser\Node\Expr|\PhpParser\Node\Identifier $node diff --git a/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php b/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php index 07eba938ec4..b8ced3884c8 100644 --- a/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php +++ b/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php @@ -153,6 +153,9 @@ CODE_SAMPLE if ($this->nodeNameResolver->isStringName($classLikeName, $classToSkip)) { return \true; } + if (\fnmatch($classToSkip, $classLikeName, \FNM_NOESCAPE)) { + return \true; + } } return \false; } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 16a91101c40..3ca2745da45 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 = '76cf20f8d4e2bb2a6c01f70e707e58d34c4360f4'; + public const PACKAGE_VERSION = 'ead7a25b38797531d9e6a755492200d59b05b1ae'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-09-10 13:23:37'; + public const RELEASE_DATE = '2023-09-10 20:38:12'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 41f2c208e56..f2c7769eedc 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 ComposerAutoloaderInitc551674fc35ead680edddda88fadf80a::getLoader(); +return ComposerAutoloaderInitb96941ed079f07afe1c366e3499c4982::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 5fb88a22f08..1c10d3dece8 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitc551674fc35ead680edddda88fadf80a +class ComposerAutoloaderInitb96941ed079f07afe1c366e3499c4982 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInitc551674fc35ead680edddda88fadf80a return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitc551674fc35ead680edddda88fadf80a', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb96941ed079f07afe1c366e3499c4982', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInitc551674fc35ead680edddda88fadf80a', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb96941ed079f07afe1c366e3499c4982', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitc551674fc35ead680edddda88fadf80a::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitb96941ed079f07afe1c366e3499c4982::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInitc551674fc35ead680edddda88fadf80a::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInitb96941ed079f07afe1c366e3499c4982::$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 1ceb2b10667..a00c1006e1d 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitc551674fc35ead680edddda88fadf80a +class ComposerStaticInitb96941ed079f07afe1c366e3499c4982 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -2599,9 +2599,9 @@ class ComposerStaticInitc551674fc35ead680edddda88fadf80a public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitc551674fc35ead680edddda88fadf80a::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitc551674fc35ead680edddda88fadf80a::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitc551674fc35ead680edddda88fadf80a::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitb96941ed079f07afe1c366e3499c4982::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitb96941ed079f07afe1c366e3499c4982::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitb96941ed079f07afe1c366e3499c4982::$classMap; }, null, ClassLoader::class); }