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

Updated Rector to commit ecec40ce9d1b075c65dbbbabe38dbd70d5a50df5

Browse Source 
ecec40ce9d [DeadCode] Skip re-assigned variable in RemoveJustPropertyFetchRector (#3124)
This commit is contained in:
Tomas Votruba 2022-11-28 16:12:25 +00:00
parent d60996d358
commit 789d270789
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustPropertyFetchRector.php
View File

@ -106,15 +106,15 @@ CODE_SAMPLE
}
// filter out variable usages that are part of nested property fetch, or change variable
$variableUsages = $this->filterOutReferencedVariableUsages($variableUsages);
if ($this->isOverridenWithConcatAssign($variableUsages)) {
if ($variableUsages === []) {
return null;
}
if ($this->isOverridenWithAssign($variableUsages)) {
return null;
}
if (!$variableToPropertyAssign instanceof PropertyFetchToVariableAssign) {
return null;
}
if ($variableUsages === []) {
return null;
}
/** @var int $currentStmtKey */
return $this->replaceVariablesWithPropertyFetch($node, $currentStmtKey, $variableUsages, $variableToPropertyAssign->getPropertyFetch());
}
@ -212,14 +212,15 @@ CODE_SAMPLE
/**
* @param Variable[] $variables
*/
private function isOverridenWithConcatAssign(array $variables) : bool
private function isOverridenWithAssign(array $variables) : bool
{
foreach ($variables as $variable) {
$parentNode = $variable->getAttribute(AttributeKey::PARENT_NODE);
if (!$parentNode instanceof Concat) {
continue;
if ($parentNode instanceof Concat && $parentNode->var === $variable) {
return \true;
}
if ($parentNode->var === $variable) {
// variable is overriden
if ($parentNode instanceof Assign && $parentNode->var === $variable) {
return \true;
}
}

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '63ca8727cbf38fdbcc1a68c429ce3dc2340f268e';
public const PACKAGE_VERSION = 'ecec40ce9d1b075c65dbbbabe38dbd70d5a50df5';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-11-28 16:54:30';
public const RELEASE_DATE = '2022-11-28 16:07:51';
/**
* @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 ComposerAutoloaderInit83a37a0b2827f72d28f454f73250a859::getLoader();
return ComposerAutoloaderInit1d895023c888ab4399bbaf51e5db00c5::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit83a37a0b2827f72d28f454f73250a859
class ComposerAutoloaderInit1d895023c888ab4399bbaf51e5db00c5
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit83a37a0b2827f72d28f454f73250a859
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit83a37a0b2827f72d28f454f73250a859', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit1d895023c888ab4399bbaf51e5db00c5', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit83a37a0b2827f72d28f454f73250a859', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit1d895023c888ab4399bbaf51e5db00c5', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit83a37a0b2827f72d28f454f73250a859::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit1d895023c888ab4399bbaf51e5db00c5::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit83a37a0b2827f72d28f454f73250a859::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit1d895023c888ab4399bbaf51e5db00c5::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire83a37a0b2827f72d28f454f73250a859($fileIdentifier, $file);
composerRequire1d895023c888ab4399bbaf51e5db00c5($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit83a37a0b2827f72d28f454f73250a859
* @param string $file
* @return void
*/
function composerRequire83a37a0b2827f72d28f454f73250a859($fileIdentifier, $file)
function composerRequire1d895023c888ab4399bbaf51e5db00c5($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 ComposerStaticInit83a37a0b2827f72d28f454f73250a859
class ComposerStaticInit1d895023c888ab4399bbaf51e5db00c5
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3013,9 +3013,9 @@ class ComposerStaticInit83a37a0b2827f72d28f454f73250a859
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit83a37a0b2827f72d28f454f73250a859::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit83a37a0b2827f72d28f454f73250a859::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit83a37a0b2827f72d28f454f73250a859::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit1d895023c888ab4399bbaf51e5db00c5::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit1d895023c888ab4399bbaf51e5db00c5::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit1d895023c888ab4399bbaf51e5db00c5::$classMap;
}, null, ClassLoader::class);
}