1
0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-11 11:02:38 +02:00

Updated Rector to commit ead7a25b38797531d9e6a755492200d59b05b1ae

ead7a25b38 Remove regex and fnmatch again on NodeNameResolver ()
This commit is contained in:
Tomas Votruba 2023-09-10 13:55:50 +00:00
parent 1e7c1e02b0
commit 973097e0b8
12 changed files with 32 additions and 29 deletions

2
vendor/autoload.php vendored

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

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitb96941ed079f07afe1c366e3499c4982
class ComposerAutoloaderInit53b0e3e95d1cb9246d5a60b112b08b6c
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitb96941ed079f07afe1c366e3499c4982
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitb96941ed079f07afe1c366e3499c4982', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit53b0e3e95d1cb9246d5a60b112b08b6c', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitb96941ed079f07afe1c366e3499c4982', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit53b0e3e95d1cb9246d5a60b112b08b6c', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitb96941ed079f07afe1c366e3499c4982::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit53b0e3e95d1cb9246d5a60b112b08b6c::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitb96941ed079f07afe1c366e3499c4982::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit53b0e3e95d1cb9246d5a60b112b08b6c::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitb96941ed079f07afe1c366e3499c4982
class ComposerStaticInit53b0e3e95d1cb9246d5a60b112b08b6c
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2599,9 +2599,9 @@ class ComposerStaticInitb96941ed079f07afe1c366e3499c4982
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitb96941ed079f07afe1c366e3499c4982::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb96941ed079f07afe1c366e3499c4982::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitb96941ed079f07afe1c366e3499c4982::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit53b0e3e95d1cb9246d5a60b112b08b6c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit53b0e3e95d1cb9246d5a60b112b08b6c::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit53b0e3e95d1cb9246d5a60b112b08b6c::$classMap;
}, null, ClassLoader::class);
}

@ -1872,12 +1872,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-phpunit.git",
"reference": "fde1cef6981bd2b43bc97ac30a9edb922ab2a620"
"reference": "942af4fef472e3a115ab555fda0761981da6d034"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/fde1cef6981bd2b43bc97ac30a9edb922ab2a620",
"reference": "fde1cef6981bd2b43bc97ac30a9edb922ab2a620",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/942af4fef472e3a115ab555fda0761981da6d034",
"reference": "942af4fef472e3a115ab555fda0761981da6d034",
"shasum": ""
},
"require": {
@ -1907,7 +1907,7 @@
"tomasvotruba\/unused-public": "^0.3",
"tracy\/tracy": "^2.10"
},
"time": "2023-09-10T03:12:22+00:00",
"time": "2023-09-10T13:47:42+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {

File diff suppressed because one or more lines are too long

@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
*/
final class GeneratedConfig
{
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main aecc9c7'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main fa41cc7'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main fde1cef'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main d4f8c9d'));
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main aecc9c7'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main fa41cc7'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 942af4f'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main d4f8c9d'));
private function __construct()
{
}

@ -61,7 +61,7 @@ CODE_SAMPLE
if (!$this->testsNodeAnalyzer->isInTestClass($node)) {
return null;
}
if (!\fnmatch('test*', $node->name->toString(), \FNM_NOESCAPE)) {
if (\strncmp($node->name->toString(), 'test', \strlen('test')) !== 0) {
return null;
}
if ($node->stmts === null) {

@ -71,7 +71,7 @@ CODE_SAMPLE
if (!$this->testsNodeAnalyzer->isInTestClass($node)) {
return null;
}
if (\fnmatch('test*', $node->name->toString(), \FNM_NOESCAPE)) {
if (\strncmp($node->name->toString(), 'test', \strlen('test')) === 0) {
return null;
}
$docComment = $node->getDocComment();

@ -85,7 +85,7 @@ CODE_SAMPLE
if (!$this->isNames($node->class, ['static', 'self'])) {
return null;
}
if (!\fnmatch('assert*', $methodName, \FNM_NOESCAPE)) {
if (\strncmp($methodName, 'assert', \strlen('assert')) !== 0) {
return null;
}
$hasChanged = \true;

@ -97,10 +97,11 @@ CODE_SAMPLE
$hasChanged = \false;
$dataProviderClassMethods = $this->dataProviderClassMethodFinder->find($node);
foreach ($dataProviderClassMethods as $dataProviderClassMethod) {
if (!\fnmatch('test*', $dataProviderClassMethod->name->toString(), \FNM_NOESCAPE)) {
$dataProviderClassMethodName = $dataProviderClassMethod->name->toString();
if (\strncmp($dataProviderClassMethodName, 'test', \strlen('test')) !== 0) {
continue;
}
$shortMethodName = Strings::substring($dataProviderClassMethod->name->toString(), 4);
$shortMethodName = Strings::substring($dataProviderClassMethodName, 4);
$shortMethodName = \lcfirst($shortMethodName);
$dataProviderClassMethod->name = new Identifier($shortMethodName);
$hasChanged = \true;

@ -46,6 +46,10 @@ final class AssertCallAnalyzer
* @var int
*/
private const MAX_NESTED_METHOD_CALL_LEVEL = 5;
/**
* @var string[]
*/
private const ASSERT_METHOD_NAME_PREFIXES = ['expectNotToPerformAssertions', 'assert', 'expectException', 'setExpectedException', 'expectOutput', 'should'];
/**
* @var array<string, bool>
*/
@ -160,14 +164,12 @@ final class AssertCallAnalyzer
if (!$call->name instanceof Identifier) {
return \false;
}
$callname = $call->name->toString();
foreach (['doTestFileInfo', 'expectNotToPerformAssertions'] as $methodCallName) {
if ($callname === $methodCallName) {
return \true;
}
$callName = $this->nodeNameResolver->getName($call->name);
if (!\is_string($callName)) {
return \false;
}
foreach (['*assert', 'assert*', 'expectException*', 'setExpectedException*', 'expectOutput*', 'should*'] as $methodCallNamePattern) {
if (\fnmatch($methodCallNamePattern, $callname, \FNM_NOESCAPE)) {
foreach (self::ASSERT_METHOD_NAME_PREFIXES as $assertMethodNamePrefix) {
if (\strncmp($callName, $assertMethodNamePrefix, \strlen($assertMethodNamePrefix)) === 0) {
return \true;
}
}

@ -64,7 +64,7 @@ final class TestsNodeAnalyzer
if (!$classMethod->isPublic()) {
return \false;
}
if (\fnmatch('test*', $classMethod->name->toString(), \FNM_NOESCAPE)) {
if (\strncmp($classMethod->name->toString(), 'test', \strlen('test')) === 0) {
return \true;
}
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($classMethod);