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

Updated Rector to commit 2dd8c6b814

Browse Source 
2dd8c6b814 [CodeQuality][DeadCode] Add For_, Closure, and Finally_, Case_, Catch_ to NodeTypeGroup::STMTS_AWARE (#2258)
This commit is contained in:
Tomas Votruba 2022-05-07 18:33:57 +00:00
parent 0f7f24ba96
commit f63eef01d0
9 changed files with 33 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rules/CodeQuality/NodeTypeGroup.php
View File

@ -4,10 +4,15 @@ declare (strict_types=1);
namespace Rector\CodeQuality;
use PhpParser\Node;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Stmt\Case_;
use PhpParser\Node\Stmt\Catch_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Do_;
use PhpParser\Node\Stmt\Else_;
use PhpParser\Node\Stmt\ElseIf_;
use PhpParser\Node\Stmt\Finally_;
use PhpParser\Node\Stmt\For_;
use PhpParser\Node\Stmt\Foreach_;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\If_;
@ -20,5 +25,5 @@ final class NodeTypeGroup
* @todo create a virtual node, getStmts(): array
* @var array<class-string<Node>>
*/
public const STMTS_AWARE = [\PhpParser\Node\Stmt\ClassMethod::class, \PhpParser\Node\Stmt\Function_::class, \PhpParser\Node\Stmt\If_::class, \PhpParser\Node\Stmt\Else_::class, \PhpParser\Node\Stmt\ElseIf_::class, \PhpParser\Node\Stmt\Do_::class, \PhpParser\Node\Stmt\Foreach_::class, \PhpParser\Node\Stmt\TryCatch::class, \PhpParser\Node\Stmt\While_::class];
public const STMTS_AWARE = [\PhpParser\Node\Stmt\ClassMethod::class, \PhpParser\Node\Stmt\Function_::class, \PhpParser\Node\Stmt\If_::class, \PhpParser\Node\Stmt\Else_::class, \PhpParser\Node\Stmt\ElseIf_::class, \PhpParser\Node\Stmt\Do_::class, \PhpParser\Node\Stmt\Foreach_::class, \PhpParser\Node\Stmt\TryCatch::class, \PhpParser\Node\Stmt\While_::class, \PhpParser\Node\Stmt\For_::class, \PhpParser\Node\Expr\Closure::class, \PhpParser\Node\Stmt\Finally_::class, \PhpParser\Node\Stmt\Case_::class, \PhpParser\Node\Stmt\Catch_::class];
}

7
rules/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector.php
View File

@ -9,9 +9,7 @@ use PhpParser\Node\Expr\ArrayItem;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Return_;
use Rector\CodeQuality\NodeAnalyzer\VariableDimFetchAssignResolver;
use Rector\CodeQuality\NodeTypeGroup;
@ -19,6 +17,7 @@ use Rector\CodeQuality\ValueObject\KeyAndExpr;
use Rector\Core\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use RectorPrefix20220507\Webmozart\Assert\Assert;
/**
* @see \Rector\Tests\CodeQuality\Rector\ClassMethod\InlineArrayReturnAssignRector\InlineArrayReturnAssignRectorTest
*/
@ -63,11 +62,9 @@ CODE_SAMPLE
{
return \Rector\CodeQuality\NodeTypeGroup::STMTS_AWARE;
}
/**
* @param ClassMethod|Function_ $node
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
\RectorPrefix20220507\Webmozart\Assert\Assert::propertyExists($node, 'stmts');
/** @var Stmt[]|null $stmts */
$stmts = $node->stmts;
if ($stmts === null) {

20
rules/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector.php
View File

@ -4,35 +4,25 @@ declare (strict_types=1);
namespace Rector\DeadCode\Rector\Stmt;
use PhpParser\Node;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Expr\Exit_;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Break_;
use PhpParser\Node\Stmt\Case_;
use PhpParser\Node\Stmt\Catch_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Continue_;
use PhpParser\Node\Stmt\Do_;
use PhpParser\Node\Stmt\Else_;
use PhpParser\Node\Stmt\ElseIf_;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Finally_;
use PhpParser\Node\Stmt\For_;
use PhpParser\Node\Stmt\Foreach_;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Goto_;
use PhpParser\Node\Stmt\If_;
use PhpParser\Node\Stmt\InlineHTML;
use PhpParser\Node\Stmt\Label;
use PhpParser\Node\Stmt\Nop;
use PhpParser\Node\Stmt\Return_;
use PhpParser\Node\Stmt\Throw_;
use PhpParser\Node\Stmt\TryCatch;
use PhpParser\Node\Stmt\While_;
use Rector\CodeQuality\NodeTypeGroup;
use Rector\Core\Rector\AbstractRector;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use RectorPrefix20220507\Webmozart\Assert\Assert;
/**
* @changelog https://github.com/phpstan/phpstan/blob/83078fe308a383c618b8c1caec299e5765d9ac82/src/Node/UnreachableStatementNode.php
*
@ -69,13 +59,11 @@ CODE_SAMPLE
*/
public function getNodeTypes() : array
{
return [\PhpParser\Node\Stmt\For_::class, \PhpParser\Node\Stmt\Foreach_::class, \PhpParser\Node\Stmt\Do_::class, \PhpParser\Node\Stmt\While_::class, \PhpParser\Node\Stmt\ClassMethod::class, \PhpParser\Node\Stmt\Function_::class, \PhpParser\Node\Expr\Closure::class, \PhpParser\Node\Stmt\If_::class, \PhpParser\Node\Stmt\ElseIf_::class, \PhpParser\Node\Stmt\Else_::class, \PhpParser\Node\Stmt\Case_::class, \PhpParser\Node\Stmt\TryCatch::class, \PhpParser\Node\Stmt\Catch_::class, \PhpParser\Node\Stmt\Finally_::class];
return \Rector\CodeQuality\NodeTypeGroup::STMTS_AWARE;
}
/**
* @param For_|Foreach_|Do_|While_|ClassMethod|Function_|Closure|If_|ElseIf_|Else_|Case_|TryCatch|Catch_|Finally_ $node
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
\RectorPrefix20220507\Webmozart\Assert\Assert::propertyExists($node, 'stmts');
if ($node->stmts === null) {
return null;
}

7
rules/EarlyReturn/Rector/If_/ChangeNestedIfsToEarlyReturnRector.php
View File

@ -7,8 +7,6 @@ use PhpParser\Node;
use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
use PhpParser\Node\Expr\BooleanNot;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\If_;
use PhpParser\Node\Stmt\Return_;
use Rector\CodeQuality\NodeTypeGroup;
@ -17,6 +15,7 @@ use Rector\Core\Rector\AbstractRector;
use Rector\EarlyReturn\NodeTransformer\ConditionInverter;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use RectorPrefix20220507\Webmozart\Assert\Assert;
/**
* @see \Rector\Tests\EarlyReturn\Rector\If_\ChangeNestedIfsToEarlyReturnRector\ChangeNestedIfsToEarlyReturnRectorTest
*/
@ -80,11 +79,9 @@ CODE_SAMPLE
{
return \Rector\CodeQuality\NodeTypeGroup::STMTS_AWARE;
}
/**
* @param Function_|ClassMethod $node
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
\RectorPrefix20220507\Webmozart\Assert\Assert::propertyExists($node, 'stmts');
$stmts = $node->stmts;
if ($stmts === null) {
return null;

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '333933b2d37035134f71f29af0f2e923caaef45a';
public const PACKAGE_VERSION = '2dd8c6b81436f32ff91cabeb6ca658d89a7cae47';
/**
* @var string
*/
public const RELEASE_DATE = '2022-05-07 20:12:58';
public const RELEASE_DATE = '2022-05-07 18:25:25';
/**
* @var string
*/

2
vendor/autoload.php vendored
View File

@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInite705914248a5c1c227c811f5fdf95f71::getLoader();
return ComposerAutoloaderInit458c630d57f90242b3075e9ffcf8c8aa::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInite705914248a5c1c227c811f5fdf95f71
class ComposerAutoloaderInit458c630d57f90242b3075e9ffcf8c8aa
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInite705914248a5c1c227c811f5fdf95f71
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInite705914248a5c1c227c811f5fdf95f71', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit458c630d57f90242b3075e9ffcf8c8aa', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInite705914248a5c1c227c811f5fdf95f71', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit458c630d57f90242b3075e9ffcf8c8aa', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInite705914248a5c1c227c811f5fdf95f71::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit458c630d57f90242b3075e9ffcf8c8aa::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInite705914248a5c1c227c811f5fdf95f71::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit458c630d57f90242b3075e9ffcf8c8aa::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiree705914248a5c1c227c811f5fdf95f71($fileIdentifier, $file);
composerRequire458c630d57f90242b3075e9ffcf8c8aa($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInite705914248a5c1c227c811f5fdf95f71
* @param string $file
* @return void
*/
function composerRequiree705914248a5c1c227c811f5fdf95f71($fileIdentifier, $file)
function composerRequire458c630d57f90242b3075e9ffcf8c8aa($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 ComposerStaticInite705914248a5c1c227c811f5fdf95f71
class ComposerStaticInit458c630d57f90242b3075e9ffcf8c8aa
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -3882,9 +3882,9 @@ class ComposerStaticInite705914248a5c1c227c811f5fdf95f71
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInite705914248a5c1c227c811f5fdf95f71::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite705914248a5c1c227c811f5fdf95f71::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInite705914248a5c1c227c811f5fdf95f71::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit458c630d57f90242b3075e9ffcf8c8aa::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit458c630d57f90242b3075e9ffcf8c8aa::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit458c630d57f90242b3075e9ffcf8c8aa::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20220507\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInite705914248a5c1c227c811f5fdf95f71', false) && !interface_exists('ComposerAutoloaderInite705914248a5c1c227c811f5fdf95f71', false) && !trait_exists('ComposerAutoloaderInite705914248a5c1c227c811f5fdf95f71', false)) {
spl_autoload_call('RectorPrefix20220507\ComposerAutoloaderInite705914248a5c1c227c811f5fdf95f71');
if (!class_exists('ComposerAutoloaderInit458c630d57f90242b3075e9ffcf8c8aa', false) && !interface_exists('ComposerAutoloaderInit458c630d57f90242b3075e9ffcf8c8aa', false) && !trait_exists('ComposerAutoloaderInit458c630d57f90242b3075e9ffcf8c8aa', false)) {
spl_autoload_call('RectorPrefix20220507\ComposerAutoloaderInit458c630d57f90242b3075e9ffcf8c8aa');
}
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('RectorPrefix20220507\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220507\print_node(...func_get_args());
}
}
if (!function_exists('composerRequiree705914248a5c1c227c811f5fdf95f71')) {
function composerRequiree705914248a5c1c227c811f5fdf95f71() {
return \RectorPrefix20220507\composerRequiree705914248a5c1c227c811f5fdf95f71(...func_get_args());
if (!function_exists('composerRequire458c630d57f90242b3075e9ffcf8c8aa')) {
function composerRequire458c630d57f90242b3075e9ffcf8c8aa() {
return \RectorPrefix20220507\composerRequire458c630d57f90242b3075e9ffcf8c8aa(...func_get_args());
}
}
if (!function_exists('scanPath')) {