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 ef6c8bcc96bcb35a832ca0e798d580735c58f9ef 

ef6c8bcc96 [NodeNameResolver] Check regex start delimiter and contains * on NodeNameResolver to use fnmatch() (#4964)
This commit is contained in:
Tomas Votruba 2023-09-10 13:01:10 +00:00
parent 0208918c02
commit 5995088c4e
6 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/NodeNameResolver/NodeNameResolver.php
View File

@ -14,7 +14,9 @@ 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
{
@ -28,6 +30,11 @@ final class NodeNameResolver
* @var \Rector\Core\NodeAnalyzer\CallAnalyzer
*/
private $callAnalyzer;
/**
* @readonly
* @var \Rector\NodeNameResolver\Regex\RegexPatternDetector
*/
private $regexPatternDetector;
/**
* @var NodeNameResolverInterface[]
* @readonly
@ -40,10 +47,11 @@ final class NodeNameResolver
/**
* @param NodeNameResolverInterface[] $nodeNameResolvers
*/
public function __construct(ClassNaming $classNaming, CallAnalyzer $callAnalyzer, iterable $nodeNameResolvers = [])
public function __construct(ClassNaming $classNaming, CallAnalyzer $callAnalyzer, RegexPatternDetector $regexPatternDetector, iterable $nodeNameResolvers = [])
{
$this->classNaming = $classNaming;
$this->callAnalyzer = $callAnalyzer;
$this->regexPatternDetector = $regexPatternDetector;
$this->nodeNameResolvers = $nodeNameResolvers;
}
/**
@ -171,7 +179,16 @@ final class NodeNameResolver
if ($desiredName === 'Object') {
return $desiredName === $resolvedName;
}
return \strcasecmp($resolvedName, $desiredName) === 0;
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;
}
/**
* @param \PhpParser\Node\Expr|\PhpParser\Node\Identifier $node

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

@ -153,9 +153,6 @@ 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 = '071730611619e0b6eb79d18af29480341d4a0361';
public const PACKAGE_VERSION = 'ef6c8bcc96bcb35a832ca0e798d580735c58f9ef';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-09-10 19:26:44';
public const RELEASE_DATE = '2023-09-10 19:58:28';
/**
* @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 ComposerAutoloaderInitfe835b1f541b02a5c8bce8f260ecdb75::getLoader();
return ComposerAutoloaderInitbf38c3be360e5f7b6ef8749842caf2f1::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitfe835b1f541b02a5c8bce8f260ecdb75
class ComposerAutoloaderInitbf38c3be360e5f7b6ef8749842caf2f1
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitfe835b1f541b02a5c8bce8f260ecdb75
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitfe835b1f541b02a5c8bce8f260ecdb75', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitbf38c3be360e5f7b6ef8749842caf2f1', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitfe835b1f541b02a5c8bce8f260ecdb75', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitbf38c3be360e5f7b6ef8749842caf2f1', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitfe835b1f541b02a5c8bce8f260ecdb75::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitbf38c3be360e5f7b6ef8749842caf2f1::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitfe835b1f541b02a5c8bce8f260ecdb75::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInitbf38c3be360e5f7b6ef8749842caf2f1::$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 ComposerStaticInitfe835b1f541b02a5c8bce8f260ecdb75
class ComposerStaticInitbf38c3be360e5f7b6ef8749842caf2f1
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2599,9 +2599,9 @@ class ComposerStaticInitfe835b1f541b02a5c8bce8f260ecdb75
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitfe835b1f541b02a5c8bce8f260ecdb75::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitfe835b1f541b02a5c8bce8f260ecdb75::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitfe835b1f541b02a5c8bce8f260ecdb75::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitbf38c3be360e5f7b6ef8749842caf2f1::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitbf38c3be360e5f7b6ef8749842caf2f1::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitbf38c3be360e5f7b6ef8749842caf2f1::$classMap;
}, null, ClassLoader::class);
}