Updated Rector to commit 5fd67ab

rectorphp/rector-src@5fd67ab [DeadCode] Skip RemoveUnusedAssignVariableRector on used after if else (#213)
rectorphp · Jun 13, 2021 · 0439a83 · 0439a83
1 parent 32c476e
commit 0439a83
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 23 deletions.
diff --git a/rules/DeadCode/Rector/Assign/RemoveUnusedAssignVariableRector.php b/rules/DeadCode/Rector/Assign/RemoveUnusedAssignVariableRector.php
@@ -6,6 +6,8 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Stmt\Else_;
+use PhpParser\Node\Stmt\If_;
 use PHPStan\Analyser\Scope;
 use Rector\Core\Rector\AbstractRector;
 use Rector\DeadCode\NodeFinder\NextVariableUsageNodeFinder;
@@ -104,19 +106,28 @@ public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
  }
  private function shouldSkipAssign(\PhpParser\Node\Expr\Assign $assign) : bool
  {
- if (!$assign->var instanceof \PhpParser\Node\Expr\Variable) {
+ $variable = $assign->var;
+ if (!$variable instanceof \PhpParser\Node\Expr\Variable) {
  return \true;
  }
  // unable to resolve name
- $variableName = $this->getName($assign->var);
+ $variableName = $this->getName($variable);
  if ($variableName === null) {
  return \true;
  }
  if ($this->isNestedAssign($assign)) {
  return \true;
  }
- $nextUsedVariable = $this->nextVariableUsageNodeFinder->find($assign);
- return $nextUsedVariable !== null;
+ $parentIf = $this->betterNodeFinder->findParentType($assign, \PhpParser\Node\Stmt\If_::class);
+ if (!$parentIf instanceof \PhpParser\Node\Stmt\If_) {
+ return (bool) $this->nextVariableUsageNodeFinder->find($assign);
+ }
+ if (!$parentIf->else instanceof \PhpParser\Node\Stmt\Else_) {
+ return (bool) $this->nextVariableUsageNodeFinder->find($assign);
+ }
+ return (bool) $this->betterNodeFinder->findFirstNext($parentIf, function (\PhpParser\Node $node) use($variable) : bool {
+ return $this->nodeComparator->areNodesEqual($node, $variable);
+ });
  }
  private function isVariableTypeInScope(\PhpParser\Node\Expr\Assign $assign) : bool
  {

diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -16,11 +16,11 @@ final class VersionResolver
  /**
  * @var string
  */
- public const PACKAGE_VERSION = '688804984677d51dcf0aa7b64c92081182efd0f2';
+ public const PACKAGE_VERSION = '5fd67abde62e9d24cdad9c3f9001b020ec5ad07c';
  /**
  * @var string
  */
- public const RELEASE_DATE = '2021-06-13 11:26:01';
+ public const RELEASE_DATE = '2021-06-13 16:52:59';
  public static function resolvePackageVersion() : string
  {
  $process = new \RectorPrefix20210613\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInite540b9db74682d1424d59ff222a007d3::getLoader();
+return ComposerAutoloaderInit6d54956d166a2cb0e2bceed48e21e6ad::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInite540b9db74682d1424d59ff222a007d3
+class ComposerAutoloaderInit6d54956d166a2cb0e2bceed48e21e6ad
 {
  private static $loader;
 
@@ -22,15 +22,15 @@ public static function getLoader()
  return self::$loader;
  }
 
- spl_autoload_register(array('ComposerAutoloaderInite540b9db74682d1424d59ff222a007d3', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit6d54956d166a2cb0e2bceed48e21e6ad', 'loadClassLoader'), true, true);
  self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInite540b9db74682d1424d59ff222a007d3', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit6d54956d166a2cb0e2bceed48e21e6ad', 'loadClassLoader'));
 
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
  if ($useStaticLoader) {
  require __DIR__ . '/autoload_static.php';
 
- call_user_func(\Composer\Autoload\ComposerStaticInite540b9db74682d1424d59ff222a007d3::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit6d54956d166a2cb0e2bceed48e21e6ad::getInitializer($loader));
  } else {
  $classMap = require __DIR__ . '/autoload_classmap.php';
  if ($classMap) {
@@ -42,19 +42,19 @@ public static function getLoader()
  $loader->register(true);
 
  if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInite540b9db74682d1424d59ff222a007d3::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit6d54956d166a2cb0e2bceed48e21e6ad::$files;
  } else {
  $includeFiles = require __DIR__ . '/autoload_files.php';
  }
  foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequiree540b9db74682d1424d59ff222a007d3($fileIdentifier, $file);
+ composerRequire6d54956d166a2cb0e2bceed48e21e6ad($fileIdentifier, $file);
  }
 
  return $loader;
  }
 }
 
-function composerRequiree540b9db74682d1424d59ff222a007d3($fileIdentifier, $file)
+function composerRequire6d54956d166a2cb0e2bceed48e21e6ad($fileIdentifier, $file)
 {
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
  require $file;

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInite540b9db74682d1424d59ff222a007d3
+class ComposerStaticInit6d54956d166a2cb0e2bceed48e21e6ad
 {
  public static $files = array (
  'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -3864,9 +3864,9 @@ class ComposerStaticInite540b9db74682d1424d59ff222a007d3
  public static function getInitializer(ClassLoader $loader)
  {
  return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInite540b9db74682d1424d59ff222a007d3::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInite540b9db74682d1424d59ff222a007d3::$prefixDirsPsr4;
- $loader->classMap = ComposerStaticInite540b9db74682d1424d59ff222a007d3::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit6d54956d166a2cb0e2bceed48e21e6ad::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit6d54956d166a2cb0e2bceed48e21e6ad::$prefixDirsPsr4;
+ $loader->classMap = ComposerStaticInit6d54956d166a2cb0e2bceed48e21e6ad::$classMap;
 
  }, null, ClassLoader::class);
  }

diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php
@@ -21,8 +21,8 @@
 if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) {
  spl_autoload_call('RectorPrefix20210613\CheckoutEntityFactory');
 }
-if (!class_exists('ComposerAutoloaderInite540b9db74682d1424d59ff222a007d3', false) && !interface_exists('ComposerAutoloaderInite540b9db74682d1424d59ff222a007d3', false) && !trait_exists('ComposerAutoloaderInite540b9db74682d1424d59ff222a007d3', false)) {
- spl_autoload_call('RectorPrefix20210613\ComposerAutoloaderInite540b9db74682d1424d59ff222a007d3');
+if (!class_exists('ComposerAutoloaderInit6d54956d166a2cb0e2bceed48e21e6ad', false) && !interface_exists('ComposerAutoloaderInit6d54956d166a2cb0e2bceed48e21e6ad', false) && !trait_exists('ComposerAutoloaderInit6d54956d166a2cb0e2bceed48e21e6ad', false)) {
+ spl_autoload_call('RectorPrefix20210613\ComposerAutoloaderInit6d54956d166a2cb0e2bceed48e21e6ad');
 }
 if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
  spl_autoload_call('RectorPrefix20210613\Doctrine\Inflector\Inflector');
@@ -3323,9 +3323,9 @@ function print_node() {
  return \RectorPrefix20210613\print_node(...func_get_args());
  }
 }
-if (!function_exists('composerRequiree540b9db74682d1424d59ff222a007d3')) {
- function composerRequiree540b9db74682d1424d59ff222a007d3() {
- return \RectorPrefix20210613\composerRequiree540b9db74682d1424d59ff222a007d3(...func_get_args());
+if (!function_exists('composerRequire6d54956d166a2cb0e2bceed48e21e6ad')) {
+ function composerRequire6d54956d166a2cb0e2bceed48e21e6ad() {
+ return \RectorPrefix20210613\composerRequire6d54956d166a2cb0e2bceed48e21e6ad(...func_get_args());
  }
 }
 if (!function_exists('parseArgs')) {