Updated Rector to commit 10fd4c3498

10fd4c3498 [Php70] Refactor MultiDirnameRector by moving nestingLevel check to separate method (#2488)
This commit is contained in:
Tomas Votruba 2022-06-15 07:03:39 +00:00
parent f01cff4ff3
commit 80a3820ca7
13 changed files with 65 additions and 66 deletions

2
vendor/autoload.php vendored
View File

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

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitfc7de214cea19c5ead7cdf4d374a83a0
class ComposerAutoloaderInitc1012192ba4a501ce2d790f52604e1d7
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInitfc7de214cea19c5ead7cdf4d374a83a0
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitfc7de214cea19c5ead7cdf4d374a83a0', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitc1012192ba4a501ce2d790f52604e1d7', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitfc7de214cea19c5ead7cdf4d374a83a0', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitc1012192ba4a501ce2d790f52604e1d7', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitfc7de214cea19c5ead7cdf4d374a83a0::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitc1012192ba4a501ce2d790f52604e1d7::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInitfc7de214cea19c5ead7cdf4d374a83a0::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitc1012192ba4a501ce2d790f52604e1d7::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequirefc7de214cea19c5ead7cdf4d374a83a0($fileIdentifier, $file);
composerRequirec1012192ba4a501ce2d790f52604e1d7($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInitfc7de214cea19c5ead7cdf4d374a83a0
* @param string $file
* @return void
*/
function composerRequirefc7de214cea19c5ead7cdf4d374a83a0($fileIdentifier, $file)
function composerRequirec1012192ba4a501ce2d790f52604e1d7($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitfc7de214cea19c5ead7cdf4d374a83a0
class ComposerStaticInitc1012192ba4a501ce2d790f52604e1d7
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3396,9 +3396,9 @@ class ComposerStaticInitfc7de214cea19c5ead7cdf4d374a83a0
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitfc7de214cea19c5ead7cdf4d374a83a0::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitfc7de214cea19c5ead7cdf4d374a83a0::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitfc7de214cea19c5ead7cdf4d374a83a0::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitc1012192ba4a501ce2d790f52604e1d7::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitc1012192ba4a501ce2d790f52604e1d7::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitc1012192ba4a501ce2d790f52604e1d7::$classMap;
}, null, ClassLoader::class);
}

View File

@ -755,17 +755,17 @@
},
{
"name": "phpstan\/phpdoc-parser",
"version": "1.6.2",
"version_normalized": "1.6.2.0",
"version": "1.6.3",
"version_normalized": "1.6.3.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/phpstan\/phpdoc-parser.git",
"reference": "76150ae7512439b4e6903db834e4a327596b617d"
"reference": "4a07085f74cb1f3fc7103efa537d9f00ebb74ec7"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/76150ae7512439b4e6903db834e4a327596b617d",
"reference": "76150ae7512439b4e6903db834e4a327596b617d",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/4a07085f74cb1f3fc7103efa537d9f00ebb74ec7",
"reference": "4a07085f74cb1f3fc7103efa537d9f00ebb74ec7",
"shasum": ""
},
"require": {
@ -780,7 +780,7 @@
"phpunit\/phpunit": "^9.5",
"symfony\/process": "^5.2"
},
"time": "2022-06-10T09:29:33+00:00",
"time": "2022-06-14T11:40:08+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -797,23 +797,23 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https:\/\/github.com\/phpstan\/phpdoc-parser\/issues",
"source": "https:\/\/github.com\/phpstan\/phpdoc-parser\/tree\/1.6.2"
"source": "https:\/\/github.com\/phpstan\/phpdoc-parser\/tree\/1.6.3"
},
"install-path": "..\/phpstan\/phpdoc-parser"
},
{
"name": "phpstan\/phpstan",
"version": "1.7.13",
"version_normalized": "1.7.13.0",
"version": "1.7.14",
"version_normalized": "1.7.14.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/phpstan\/phpstan.git",
"reference": "86ffc063bfd8f264c9eba568e84b0225a6090d09"
"reference": "e6f145f196a59c7ca91ea926c87ef3d936c4305f"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/86ffc063bfd8f264c9eba568e84b0225a6090d09",
"reference": "86ffc063bfd8f264c9eba568e84b0225a6090d09",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/e6f145f196a59c7ca91ea926c87ef3d936c4305f",
"reference": "e6f145f196a59c7ca91ea926c87ef3d936c4305f",
"shasum": ""
},
"require": {
@ -822,7 +822,7 @@
"conflict": {
"phpstan\/phpstan-shim": "*"
},
"time": "2022-06-13T15:15:39+00:00",
"time": "2022-06-14T13:09:35+00:00",
"bin": [
"phpstan",
"phpstan.phar"
@ -841,7 +841,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https:\/\/github.com\/phpstan\/phpstan\/issues",
"source": "https:\/\/github.com\/phpstan\/phpstan\/tree\/1.7.13"
"source": "https:\/\/github.com\/phpstan\/phpstan\/tree\/1.7.14"
},
"funding": [
{
@ -1854,12 +1854,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-cakephp.git",
"reference": "424bf6deed216860c4d668843f1ab7b228a46739"
"reference": "527dc2358abe525b4ccacd5889340ef1a6c296c5"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-cakephp\/zipball\/424bf6deed216860c4d668843f1ab7b228a46739",
"reference": "424bf6deed216860c4d668843f1ab7b228a46739",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-cakephp\/zipball\/527dc2358abe525b4ccacd5889340ef1a6c296c5",
"reference": "527dc2358abe525b4ccacd5889340ef1a6c296c5",
"shasum": ""
},
"require": {
@ -1885,7 +1885,7 @@
"symplify\/rule-doc-generator": "^11.0",
"symplify\/vendor-patches": "^11.0"
},
"time": "2022-06-13T22:54:46+00:00",
"time": "2022-06-15T06:54:15+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {
@ -1991,12 +1991,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-generator.git",
"reference": "63b3f96952e6c7b43f596d3096b7e6328b4d6893"
"reference": "285cbcacd4f3f798fd404b7bfa3efbf1744709ba"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-generator\/zipball\/63b3f96952e6c7b43f596d3096b7e6328b4d6893",
"reference": "63b3f96952e6c7b43f596d3096b7e6328b4d6893",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-generator\/zipball\/285cbcacd4f3f798fd404b7bfa3efbf1744709ba",
"reference": "285cbcacd4f3f798fd404b7bfa3efbf1744709ba",
"shasum": ""
},
"require": {
@ -2012,7 +2012,7 @@
"require-dev": {
"php-parallel-lint\/php-parallel-lint": "^1.3",
"phpstan\/extension-installer": "^1.1",
"phpstan\/phpdoc-parser": "^1.2",
"phpstan\/phpdoc-parser": "^1.6",
"phpstan\/phpstan-strict-rules": "^1.2",
"phpstan\/phpstan-webmozart-assert": "^1.0",
"phpunit\/phpunit": "^9.5",
@ -2025,7 +2025,7 @@
"symplify\/phpstan-rules": "^11.0",
"symplify\/vendor-patches": "^11.0"
},
"time": "2022-06-13T22:13:09+00:00",
"time": "2022-06-14T07:06:32+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {
@ -2050,7 +2050,7 @@
"homepage": "https:\/\/getrector.org",
"support": {
"issues": "https:\/\/github.com\/rectorphp\/rector-generator\/issues",
"source": "https:\/\/github.com\/rectorphp\/rector-generator\/tree\/main"
"source": "https:\/\/github.com\/rectorphp\/rector-generator\/tree\/0.6.7"
},
"funding": [
{

File diff suppressed because one or more lines are too long

View File

@ -3,9 +3,6 @@
declare (strict_types=1);
namespace PHPStan\PhpDocParser\Lexer;
use function array_keys;
use function assert;
use function count;
use function implode;
use function preg_match_all;
use const PREG_SET_ORDER;
@ -53,24 +50,20 @@ class Lexer
public const TYPE_OFFSET = 1;
/** @var string|null */
private $regexp;
/** @var int[]|null */
private $types;
public function tokenize(string $s) : array
{
if ($this->regexp === null || $this->types === null) {
$this->initialize();
if ($this->regexp === null) {
$this->regexp = $this->generateRegexp();
}
assert($this->regexp !== null);
assert($this->types !== null);
preg_match_all($this->regexp, $s, $matches, PREG_SET_ORDER);
$tokens = [];
foreach ($matches as $match) {
$tokens[] = [$match[0], $this->types[count($match) - 2]];
$tokens[] = [$match[0], (int) $match['MARK']];
}
$tokens[] = ['', self::TOKEN_END];
return $tokens;
}
private function initialize() : void
private function generateRegexp() : string
{
$patterns = [
self::TOKEN_HORIZONTAL_WS => '[\\x09\\x20]++',
@ -109,7 +102,9 @@ class Lexer
// anything but TOKEN_CLOSE_PHPDOC or TOKEN_HORIZONTAL_WS or TOKEN_EOL
self::TOKEN_OTHER => '(?:(?!\\*/)[^\\s])++',
];
$this->regexp = '~(' . implode(')|(', $patterns) . ')~Asi';
$this->types = array_keys($patterns);
foreach ($patterns as $type => &$pattern) {
$pattern = '(?:' . $pattern . ')(*MARK:' . $type . ')';
}
return '~' . implode('|', $patterns) . '~Asi';
}
}

Binary file not shown.

View File

@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmKnVJAACgkQzxoQjQ56
5yAHGBAAk6UfJ3JVCokVbE4CzI8mxDWD9oMweOPrGDimkdP2el23wBz9nmchYglH
3hP7YhKxG5gYrUOAjl9ziNeVF/CThOugEQUOUlqmp2t+fJNbjSpnabzSOePIv6MY
dzcHrhoIiPcTjo0Oix7xc9hNs+BMGNnoea8On+nzsQQ1CJ0acwV8AqCCM98CFNr9
p3LcYUQPVAUopEf+EqFNs/mCcIkA2SKfH3LUs9YvVSmbbdzDS6byZQwvx5k3/9Pi
Vh0WkJhBs3uA3Xcl2u1vpiwD+2/p20PZFyky6jS3Ob/lMOkThhP9obIM66O61Gt9
oNmhdJ/4wppVqqBiZd9n/FsUogWKtC9o6b6zAh67R0OLgxWJsdNHOHdsuvBb7Djs
bPgKHv3FrJ6E2fSdBkpE80KeXwPg+TWKTVsc7fV7jT4Tekill+VJpu8bZicqZL9X
hf3C89+yLKSMt/gyF/jKiOn+ArVtra97mcyooBJF/X/YCbr546NUklVq8Bs5fNYi
H2uSlosFCKIRZ9C1fEiPMpbhEXLPGu0Crs1w04jPC46pVGNghIjJFirHavPX1K06
CCpzebheagvdtK+QrPFPxYpVlTh07LsGyvIkbr+AETIAT4ZlKQvqvUicdV8lay4o
E+xYUQQt1sSRerCiT3FgKtxrbRHOjMkIOsKKN0TtTiSQXqbFY5s=
=bGkr
iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmKoiIUACgkQzxoQjQ56
5yA2TA//ceQIisicHmbufO3UGho4N5pPt/idvq5uNCi1FyIkTKRiukH15YemAhcJ
42jC5hfUX2G9mcFp+B8sOhDAawFaKcXVpw82FdMDOWS0IOiQaHqltqxS/XkWMt4C
L6zhpjbxHM+MCLYoB5rE5oi8gxqGA85TOty3U6Gb102r1i+tDYEs1oHZvuPorEfh
Lj1wsMGCGSXakbwbNJYxGE5fQz+N58rORlGKy8jI/v6hnfW5dtZjGdxoTZOLh8V1
P/zy3D+4kjrggu2VF1IynZOXPiRI8Ph6ADDwln4dYZEgzAynHzMajqK/BcLogBEK
2aK/trDMT3pSwng1/sB3OfOkN+djs4JK6JIaT+M/Iwc16wxzUQktmG8c1gpcFsiP
0GJUMmgady8BrWsJQX8Z4CNRsAJ+fLPFfvmqgHHYvd6uQoIp5Jx+GkbugrUpVNsC
2zApmN6gPSkBaoO30di3ia+Pii4GS+axOBVqOQ6IWUbclcxAaWwBDjkUHN2i8yw2
sX1x+Ujl5O3MN/aNS36Hr0Qf2oieq2mlwXjFpsG/auljTix+/3Otbb0U5HZxDZkL
txlX8uIsUhqFLMJYtEhoqrUnkoukDHVq+NjL4JSqfJJae4E83y5eHwtCkQ4ufhce
vlAR1ekQKV6IMirQYZMbUqcWZZda2tKIva76Lq5fdQM6f8dVseI=
=17Ml
-----END PGP SIGNATURE-----

View File

@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
*/
final class GeneratedConfig
{
public const EXTENSIONS = array('rector/rector-cakephp' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-cakephp', 'relative_install_path' => '../../rector-cakephp', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 424bf6d'), 'rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main cc103d0'), 'rector/rector-generator' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-generator', 'relative_install_path' => '../../rector-generator', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 63b3f96'), 'rector/rector-laravel' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-laravel', 'relative_install_path' => '../../rector-laravel', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main a2e37f3'), 'rector/rector-nette' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette', 'relative_install_path' => '../../rector-nette', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main ee23f3c'), 'rector/rector-phpoffice' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpoffice', 'relative_install_path' => '../../rector-phpoffice', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main fdbecca'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 3f4cc81'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main d817e25'));
public const EXTENSIONS = array('rector/rector-cakephp' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-cakephp', 'relative_install_path' => '../../rector-cakephp', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 527dc23'), 'rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main cc103d0'), 'rector/rector-generator' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-generator', 'relative_install_path' => '../../rector-generator', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 285cbca'), 'rector/rector-laravel' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-laravel', 'relative_install_path' => '../../rector-laravel', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main a2e37f3'), 'rector/rector-nette' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette', 'relative_install_path' => '../../rector-nette', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main ee23f3c'), 'rector/rector-phpoffice' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpoffice', 'relative_install_path' => '../../rector-phpoffice', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main fdbecca'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 3f4cc81'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main d817e25'));
private function __construct()
{
}

View File

@ -4,8 +4,11 @@ declare (strict_types=1);
namespace RectorPrefix202206;
use Rector\Config\RectorConfig;
use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
use Rector\Renaming\Rector\Name\RenameClassRector;
use Rector\Renaming\ValueObject\MethodCallRename;
# @see https://book.cakephp.org/4/en/appendices/4-4-migration-guide.html
return static function (RectorConfig $rectorConfig) : void {
$rectorConfig->ruleWithConfiguration(RenameClassRector::class, ['Cake\\TestSuite\\ConsoleIntegrationTestTrait' => 'Cake\\Console\\TestSuite\\ConsoleIntegrationTestTrait', 'Cake\\TestSuite\\Stub\\ConsoleInput' => 'Cake\\Console\\TestSuite\\StubConsoleInput', 'Cake\\TestSuite\\Stub\\ConsoleOutput' => 'Cake\\Console\\TestSuite\\StubConsoleOutput', 'Cake\\TestSuite\\Stub\\MissingConsoleInputException' => 'Cake\\Console\\TestSuite\\MissingConsoleInputException', 'Cake\\TestSuite\\HttpClientTrait' => 'Cake\\Http\\TestSuite\\HttpClientTrait']);
$rectorConfig->ruleWithConfiguration(RenameMethodRector::class, [new MethodCallRename('Cake\\Database\\Query', 'newExpr', 'expr')]);
};

View File

@ -18,7 +18,7 @@
"rector\/rector-src": "dev-main",
"php-parallel-lint\/php-parallel-lint": "^1.3",
"phpunit\/phpunit": "^9.5",
"phpstan\/phpdoc-parser": "^1.2",
"phpstan\/phpdoc-parser": "^1.6",
"symplify\/coding-standard": "^11.0",
"symplify\/easy-coding-standard": "^11.0",
"symplify\/phpstan-extensions": "^11.0",

View File

@ -15,6 +15,7 @@ final class ConfigFilesystem
private const REQUIRED_KEYS = ['__Package__', '__Category__', '__Name__'];
/**
* @see https://regex101.com/r/gJ0bHJ/1
* @var string
*/
private const LAST_ITEM_REGEX = '#;\\n};#';
/**

View File

@ -237,7 +237,7 @@ final class RectorRecipe
if (!isset($composerJson['name'])) {
continue;
}
if (\strncmp($composerJson['name'], 'rector/', \strlen('rector/')) === 0) {
if (\strncmp((string) $composerJson['name'], 'rector/', \strlen('rector/')) === 0) {
return \true;
}
}