octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit ead7a25b38797531d9e6a755492200d59b05b1ae 

ead7a25b38 Remove regex and fnmatch again on NodeNameResolver (#4968)
This commit is contained in:
Tomas Votruba 2023-09-10 13:41:40 +00:00
parent 6f00e2bba6
commit 1e7c1e02b0
6 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/NodeNameResolver/NodeNameResolver.php
View File

@ -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

3
rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php
View File

@ -153,6 +153,9 @@ CODE_SAMPLE
if ($this->nodeNameResolver->isStringName($classLikeName, $classToSkip)) {
return \true;
}
if (\fnmatch($classToSkip, $classLikeName, \FNM_NOESCAPE)) {
return \true;
}
}
return \false;
}

4
src/Application/VersionResolver.php
View File

@ -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
*/

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

@ -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;

8
vendor/composer/autoload_static.php vendored
View File

@ -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);
}