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 580c76d7fe50f608dfac67f011cd6cac33b6ef72 

580c76d7fe [DeadCode] Revert constructor with middle param removal on RemoveUnusedPrivatePropertyRector (#4016)
This commit is contained in:
Tomas Votruba 2023-05-29 12:06:26 +00:00
parent 485a9df50b
commit 672507859d
6 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rules/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector.php
View File

@ -9,6 +9,7 @@ use PhpParser\Node\Stmt\ClassMethod;
use Rector\Core\NodeAnalyzer\ParamAnalyzer;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\ValueObject\MethodName;
use Rector\Removing\NodeManipulator\ComplexNodeRemover;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
@ -21,9 +22,15 @@ final class RemoveUnusedConstructorParamRector extends AbstractRector
* @var \Rector\Core\NodeAnalyzer\ParamAnalyzer
*/
private $paramAnalyzer;
public function __construct(ParamAnalyzer $paramAnalyzer)
/**
* @readonly
* @var \Rector\Removing\NodeManipulator\ComplexNodeRemover
*/
private $complexNodeRemover;
public function __construct(ParamAnalyzer $paramAnalyzer, ComplexNodeRemover $complexNodeRemover)
{
$this->paramAnalyzer = $paramAnalyzer;
$this->complexNodeRemover = $complexNodeRemover;
}
public function getRuleDefinition() : RuleDefinition
{
@ -84,17 +91,19 @@ CODE_SAMPLE
}
private function processRemoveParams(ClassMethod $classMethod) : ?ClassMethod
{
$hasChanged = \false;
$paramKeysToBeRemoved = [];
$totalParams = $classMethod->params;
foreach ($classMethod->params as $key => $param) {
if ($this->paramAnalyzer->isParamUsedInClassMethod($classMethod, $param)) {
continue;
}
unset($classMethod->params[$key]);
$hasChanged = \true;
$paramKeysToBeRemoved[] = $key;
}
if ($hasChanged) {
return $classMethod;
$this->complexNodeRemover->processRemoveParamWithKeys($classMethod, $paramKeysToBeRemoved);
$newTotalParams = $classMethod->params;
if ($totalParams === $newTotalParams) {
return null;
}
return null;
return $classMethod;
}
}

26
rules/Removing/NodeManipulator/ComplexNodeRemover.php
View File

@ -160,11 +160,29 @@ final class ComplexNodeRemover
if ($paramKeysToBeRemoved === []) {
return;
}
foreach (\array_keys($classMethod->params) as $key) {
if (!\in_array($key, $paramKeysToBeRemoved, \true)) {
continue;
$this->processRemoveParamWithKeys($classMethod, $paramKeysToBeRemoved);
}
/**
* @param int[] $paramKeysToBeRemoved
*/
public function processRemoveParamWithKeys(ClassMethod $classMethod, array $paramKeysToBeRemoved) : void
{
$totalKeys = \count($classMethod->params) - 1;
foreach ($paramKeysToBeRemoved as $paramKeyToBeRemoved) {
$startNextKey = $paramKeyToBeRemoved + 1;
for ($nextKey = $startNextKey; $nextKey <= $totalKeys; ++$nextKey) {
if (!isset($classMethod->params[$nextKey])) {
// no next param, break the inner loop, remove the param
unset($classMethod->params[$paramKeyToBeRemoved]);
return;
}
if (\in_array($nextKey, $paramKeysToBeRemoved, \true)) {
// keep searching next key not in $paramKeysToBeRemoved
continue;
}
return;
}
unset($classMethod->params[$key]);
unset($classMethod->params[$paramKeyToBeRemoved]);
}
}
/**

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'a91057e5a1f14fe12a1e9bded2c006012c09b00d';
public const PACKAGE_VERSION = '580c76d7fe50f608dfac67f011cd6cac33b6ef72';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-05-29 09:54:36';
public const RELEASE_DATE = '2023-05-29 12:01:44';
/**
* @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 ComposerAutoloaderInit461168ccf4886ae24b1642832862c963::getLoader();
return ComposerAutoloaderInitcb446707078fddb000fece011f701c5c::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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