Skip to content

Commit

Permalink
Updated Rector to commit c51fcbf
Browse files Browse the repository at this point in the history 
rectorphp/rector-src@c51fcbf [Core] [DeadCode] Refactor RectifiedAnalyzer and ExprUsedInNextNodeAnalyzer (#1533)
  • Loading branch information
@TomasVotruba
TomasVotruba committed Dec 20, 2021
1 parent f5b0302 commit 1cfe2fe
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 49 deletions.
29 changes: 6 additions & 23 deletions rules/DeadCode/NodeAnalyzer/ExprUsedInNextNodeAnalyzer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
namespace Rector\DeadCode\NodeAnalyzer;

use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt\If_;
use PHPStan\Analyser\Scope;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
use Rector\NodeTypeResolver\Node\AttributeKey;
Expand All @@ -29,31 +26,17 @@ public function __construct(\Rector\Core\PhpParser\Node\BetterNodeFinder $better
$this->betterNodeFinder = $betterNodeFinder;
$this->exprUsedInNodeAnalyzer = $exprUsedInNodeAnalyzer;
}
/**
* $isCheckNameScope parameter is used to whether to check scope of Name that may be renamed
* @see https://github.com/rectorphp/rector/issues/6675
*/
public function isUsed(\PhpParser\Node\Expr $expr, bool $isCheckNameScope = \false) : bool
public function isUsed(\PhpParser\Node\Expr $expr) : bool
{
return (bool) $this->betterNodeFinder->findFirstNext($expr, function (\PhpParser\Node $node) use($expr, $isCheckNameScope) : bool {
if ($isCheckNameScope && $node instanceof \PhpParser\Node\Name) {
$scope = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE);
$resolvedName = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::RESOLVED_NAME);
$next = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::NEXT_NODE);
if (!$scope instanceof \PHPStan\Analyser\Scope && !$resolvedName instanceof \PhpParser\Node\Name && $next instanceof \PhpParser\Node\Arg) {
return \true;
}
}
if (!$node instanceof \PhpParser\Node\Stmt\If_) {
return $this->exprUsedInNodeAnalyzer->isUsed($node, $expr);
return (bool) $this->betterNodeFinder->findFirstNext($expr, function (\PhpParser\Node $node) use($expr) : bool {
$isUsed = $this->exprUsedInNodeAnalyzer->isUsed($node, $expr);
if ($isUsed) {
return \true;
}
/**
* handle when used along with RemoveAlwaysElseRector
*/
if (!$this->hasIfChangedByRemoveAlwaysElseRector($node)) {
return $this->exprUsedInNodeAnalyzer->isUsed($node, $expr);
}
return \true;
return $node instanceof \PhpParser\Node\Stmt\If_ && $this->hasIfChangedByRemoveAlwaysElseRector($node);
});
}
private function hasIfChangedByRemoveAlwaysElseRector(\PhpParser\Node\Stmt\If_ $if) : bool
Expand Down
4 changes: 2 additions & 2 deletions src/Application/VersionResolver.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '2cdd339cda10577cfd45dfa18b1347780065e397';
public const PACKAGE_VERSION = 'c51fcbf5ba8e4530c6992dafba25a447b89f24d0';
/**
* @var string
*/
public const RELEASE_DATE = '2021-12-20 19:02:31';
public const RELEASE_DATE = '2021-12-20 19:02:58';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211220\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);
Expand Down
15 changes: 8 additions & 7 deletions src/ProcessAnalyzer/RectifiedAnalyzer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
namespace Rector\Core\ProcessAnalyzer;

use PhpParser\Node;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Stmt\Class_;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\Core\Contract\Rector\RectorInterface;
use Rector\Core\ValueObject\Application\File;
Expand All @@ -17,13 +17,17 @@
*
* Some limitations:
*
* - only check against Stmt which not ClassLike.
* - only check against Node which not Assign or Class_
* - The checked node doesn't has PhpDocInfo changed.
*
* which possibly changed by other process.
*/
final class RectifiedAnalyzer
{
/**
* @var array<class-string<Node>>
*/
private const EXCLUDE_NODES = [\PhpParser\Node\Expr\Assign::class, \PhpParser\Node\Stmt\Class_::class];
/**
* @var array<string, RectifiedNode|null>
*/
Expand All @@ -39,10 +43,7 @@ public function __construct(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFact
}
public function verify(\Rector\Core\Contract\Rector\RectorInterface $rector, \PhpParser\Node $node, \Rector\Core\ValueObject\Application\File $currentFile) : ?\Rector\Core\ValueObject\RectifiedNode
{
if (!$node instanceof \PhpParser\Node\Stmt) {
return null;
}
if ($node instanceof \PhpParser\Node\Stmt\ClassLike) {
if (\in_array(\get_class($node), self::EXCLUDE_NODES, \true)) {
return null;
}
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInitae22fc906da3cae5d930f1315a9c9596::getLoader();
return ComposerAutoloaderInit1da546dbfe238e22804372367990b48b::getLoader();
14 changes: 7 additions & 7 deletions vendor/composer/autoload_real.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInitae22fc906da3cae5d930f1315a9c9596
class ComposerAutoloaderInit1da546dbfe238e22804372367990b48b
{
private static $loader;

Expand All @@ -22,15 +22,15 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInitae22fc906da3cae5d930f1315a9c9596', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit1da546dbfe238e22804372367990b48b', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitae22fc906da3cae5d930f1315a9c9596', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit1da546dbfe238e22804372367990b48b', '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\ComposerStaticInitae22fc906da3cae5d930f1315a9c9596::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit1da546dbfe238e22804372367990b48b::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
Expand All @@ -42,19 +42,19 @@ public static function getLoader()
$loader->register(true);

if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitae22fc906da3cae5d930f1315a9c9596::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit1da546dbfe238e22804372367990b48b::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequireae22fc906da3cae5d930f1315a9c9596($fileIdentifier, $file);
composerRequire1da546dbfe238e22804372367990b48b($fileIdentifier, $file);
}

return $loader;
}
}

function composerRequireae22fc906da3cae5d930f1315a9c9596($fileIdentifier, $file)
function composerRequire1da546dbfe238e22804372367990b48b($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/autoload_static.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInitae22fc906da3cae5d930f1315a9c9596
class ComposerStaticInit1da546dbfe238e22804372367990b48b
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
Expand Down Expand Up @@ -3832,9 +3832,9 @@ class ComposerStaticInitae22fc906da3cae5d930f1315a9c9596
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitae22fc906da3cae5d930f1315a9c9596::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitae22fc906da3cae5d930f1315a9c9596::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitae22fc906da3cae5d930f1315a9c9596::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit1da546dbfe238e22804372367990b48b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit1da546dbfe238e22804372367990b48b::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit1da546dbfe238e22804372367990b48b::$classMap;

}, null, ClassLoader::class);
}
Expand Down
10 changes: 5 additions & 5 deletions vendor/scoper-autoload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20211220\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitae22fc906da3cae5d930f1315a9c9596', false) && !interface_exists('ComposerAutoloaderInitae22fc906da3cae5d930f1315a9c9596', false) && !trait_exists('ComposerAutoloaderInitae22fc906da3cae5d930f1315a9c9596', false)) {
spl_autoload_call('RectorPrefix20211220\ComposerAutoloaderInitae22fc906da3cae5d930f1315a9c9596');
if (!class_exists('ComposerAutoloaderInit1da546dbfe238e22804372367990b48b', false) && !interface_exists('ComposerAutoloaderInit1da546dbfe238e22804372367990b48b', false) && !trait_exists('ComposerAutoloaderInit1da546dbfe238e22804372367990b48b', false)) {
spl_autoload_call('RectorPrefix20211220\ComposerAutoloaderInit1da546dbfe238e22804372367990b48b');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20211220\Helmich\TypoScriptParser\Parser\AST\Statement');
Expand Down Expand Up @@ -78,9 +78,9 @@ function print_node() {
return \RectorPrefix20211220\print_node(...func_get_args());
}
}
if (!function_exists('composerRequireae22fc906da3cae5d930f1315a9c9596')) {
function composerRequireae22fc906da3cae5d930f1315a9c9596() {
return \RectorPrefix20211220\composerRequireae22fc906da3cae5d930f1315a9c9596(...func_get_args());
if (!function_exists('composerRequire1da546dbfe238e22804372367990b48b')) {
function composerRequire1da546dbfe238e22804372367990b48b() {
return \RectorPrefix20211220\composerRequire1da546dbfe238e22804372367990b48b(...func_get_args());
}
}
if (!function_exists('scanPath')) {
Expand Down

0 comments on commit 1cfe2fe

Please sign in to comment.