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 73c1ac45e78b2e8b091f7a0cbcc0b54b9b24bb42 

73c1ac45e7 Make use of key to remove property (#4032)
This commit is contained in:
Tomas Votruba 2023-05-30 14:11:53 +00:00
parent 977bb7a99e
commit 442b2ce101
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php
View File

@ -79,19 +79,19 @@ CODE_SAMPLE
public function refactorWithScope(Node $node, Scope $scope) : ?Node
{
$hasChanged = \false;
foreach ($node->stmts as $property) {
if (!$property instanceof Property) {
foreach ($node->stmts as $key => $stmt) {
if (!$stmt instanceof Property) {
continue;
}
if ($this->shouldSkipProperty($property)) {
if ($this->shouldSkipProperty($stmt)) {
continue;
}
if ($this->propertyManipulator->isPropertyUsedInReadContext($node, $property, $scope)) {
if ($this->propertyManipulator->isPropertyUsedInReadContext($node, $stmt, $scope)) {
continue;
}
// use different variable to avoid re-assign back $hasRemoved to false
// when already asssigned to true
$isRemoved = $this->complexNodeRemover->removePropertyAndUsages($node, $property, $this->removeAssignSideEffect, $scope);
$isRemoved = $this->complexNodeRemover->removePropertyAndUsages($node, $stmt, $this->removeAssignSideEffect, $scope, $key);
if ($isRemoved) {
$hasChanged = \true;
}

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

@ -71,7 +71,7 @@ final class ComplexNodeRemover
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
$this->nodeComparator = $nodeComparator;
}
public function removePropertyAndUsages(Class_ $class, Property $property, bool $removeAssignSideEffect, Scope $scope) : bool
public function removePropertyAndUsages(Class_ $class, Property $property, bool $removeAssignSideEffect, Scope $scope, int $propertyStmtKey) : bool
{
$propertyName = $this->nodeNameResolver->getName($property);
$totalPropertyFetch = $this->propertyFetchAnalyzer->countLocalPropertyFetchName($class, $propertyName);
@ -121,7 +121,7 @@ final class ComplexNodeRemover
foreach ($expressions as $expression) {
$this->nodeRemover->removeNode($expression);
}
$this->nodeRemover->removeNode($property);
unset($class->stmts[$propertyStmtKey]);
return \true;
}
/**

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '46d2aacd80260f0d6ff7ed0454100be3ed279b63';
public const PACKAGE_VERSION = '73c1ac45e78b2e8b091f7a0cbcc0b54b9b24bb42';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-05-30 13:33:00';
public const RELEASE_DATE = '2023-05-30 14:08:01';
/**
* @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 ComposerAutoloaderInit4cd9d32ccb963c70207853dedc738553::getLoader();
return ComposerAutoloaderInit8f34c76300074b94259007e366c44d78::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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