octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-02 01:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit a75e56071aaf22d6751d2501b30272e7185e4873

Browse Source 
a75e56071a [DowngradePhp80/72] Handle DowngradeTrailingCommasInParamUseRector+DowngradeParameterTypeWideningRector (#2843)
This commit is contained in:
Tomas Votruba 2022-08-26 08:24:05 +00:00
parent 6795a511a5
commit e01c3d5d29
5 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '21695e77a8906dbdce7ada865b140ccbf73dca56';
public const PACKAGE_VERSION = 'a75e56071aaf22d6751d2501b30272e7185e4873';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-08-26 08:42:30';
public const RELEASE_DATE = '2022-08-26 10:19:58';
/**
* @var int
*/

23
src/ProcessAnalyzer/RectifiedAnalyzer.php
View File

@ -70,7 +70,9 @@ final class RectifiedAnalyzer
*/
private function shouldContinue(RectifiedNode $rectifiedNode, string $rectorClass, Node $node, ?Node $originalNode) : bool
{
if ($rectifiedNode->getRectorClass() === $rectorClass && $rectifiedNode->getNode() === $node) {
$rectifiedNodeClass = $rectifiedNode->getRectorClass();
$rectifiedNodeNode = $rectifiedNode->getNode();
if ($rectifiedNodeClass === $rectorClass && $rectifiedNodeNode === $node) {
/**
* allow to revisit the Node with same Rector rule if Node is changed by other rule
*/
@ -79,7 +81,26 @@ final class RectifiedAnalyzer
if ($originalNode instanceof Node) {
return \true;
}
if ($this->isPreviousCreatedByRuleAttributeEquals($rectifiedNodeClass, $rectifiedNodeNode, $node)) {
return \true;
}
$startTokenPos = $node->getStartTokenPos();
return $startTokenPos < 0;
}
/**
* @param class-string<RectorInterface> $rectifiedNodeClass
*/
private function isPreviousCreatedByRuleAttributeEquals(string $rectifiedNodeClass, Node $rectifiedNodeNode, Node $node) : bool
{
/** @var class-string<RectorInterface>[] $createdByRule */
$createdByRule = $node->getAttribute(AttributeKey::CREATED_BY_RULE) ?? [];
if (\count($createdByRule) !== 1) {
return \false;
}
// different rule, allowed
if (\current($createdByRule) !== $rectifiedNodeClass) {
return \true;
}
return $rectifiedNodeNode === $node;
}
}

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit247e8f9654d22e33915b5660b3fb3c6c
class ComposerAutoloaderInit82b9108dc17b518700b194e5b11302e8
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit247e8f9654d22e33915b5660b3fb3c6c
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit247e8f9654d22e33915b5660b3fb3c6c', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit82b9108dc17b518700b194e5b11302e8', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit247e8f9654d22e33915b5660b3fb3c6c', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit82b9108dc17b518700b194e5b11302e8', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit247e8f9654d22e33915b5660b3fb3c6c::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit82b9108dc17b518700b194e5b11302e8::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit247e8f9654d22e33915b5660b3fb3c6c::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit82b9108dc17b518700b194e5b11302e8::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire247e8f9654d22e33915b5660b3fb3c6c($fileIdentifier, $file);
composerRequire82b9108dc17b518700b194e5b11302e8($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit247e8f9654d22e33915b5660b3fb3c6c
* @param string $file
* @return void
*/
function composerRequire247e8f9654d22e33915b5660b3fb3c6c($fileIdentifier, $file)
function composerRequire82b9108dc17b518700b194e5b11302e8($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 ComposerStaticInit247e8f9654d22e33915b5660b3fb3c6c
class ComposerStaticInit82b9108dc17b518700b194e5b11302e8
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3256,9 +3256,9 @@ class ComposerStaticInit247e8f9654d22e33915b5660b3fb3c6c
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit247e8f9654d22e33915b5660b3fb3c6c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit247e8f9654d22e33915b5660b3fb3c6c::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit247e8f9654d22e33915b5660b3fb3c6c::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit82b9108dc17b518700b194e5b11302e8::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit82b9108dc17b518700b194e5b11302e8::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit82b9108dc17b518700b194e5b11302e8::$classMap;
}, null, ClassLoader::class);
}