octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-28 23:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit aa72166505

Browse Source 
aa72166505 [DeadCode] Remove RemoveAssignOfVoidReturnFunctionRector as unreliable, let PHPStan report and use handle various cases (#1313)
This commit is contained in:
Tomas Votruba 2021-11-25 19:16:58 +00:00
parent bc0eeadd8a
commit 2f9d13bd92
9 changed files with 25 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/set/dead-code.php
View File

@ -5,7 +5,6 @@ namespace RectorPrefix20211125;
use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
use Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector;
use Rector\DeadCode\Rector\Assign\RemoveAssignOfVoidReturnFunctionRector;
use Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector;
use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
use Rector\DeadCode\Rector\BinaryOp\RemoveDuplicatedInstanceOfRector;
@ -85,7 +84,6 @@ return static function (\Symfony\Component\DependencyInjection\Loader\Configurat
$services->set(\Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector::class);
$services->set(\Rector\DeadCode\Rector\FunctionLike\RemoveDuplicatedIfReturnRector::class);
$services->set(\Rector\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector::class);
$services->set(\Rector\DeadCode\Rector\Assign\RemoveAssignOfVoidReturnFunctionRector::class);
$services->set(\Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector::class);
$services->set(\Rector\DeadCode\Rector\Return_\RemoveDeadConditionAboveReturnRector::class);
$services->set(\Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector::class);

34
docs/rector_rules_overview.md
View File

@ -1,4 +1,4 @@
# 499 Rules Overview
# 498 Rules Overview
<br>
@ -18,7 +18,7 @@
- [Composer](#composer) (6)
- [DeadCode](#deadcode) (50)
- [DeadCode](#deadcode) (49)
- [DependencyInjection](#dependencyinjection) (2)
@ -3014,29 +3014,6 @@ return static function (ContainerConfigurator $containerConfigurator): void {
<br>
### RemoveAssignOfVoidReturnFunctionRector
Remove assign of void function/method to variable
- class: [`Rector\DeadCode\Rector\Assign\RemoveAssignOfVoidReturnFunctionRector`](../rules/DeadCode/Rector/Assign/RemoveAssignOfVoidReturnFunctionRector.php)
```diff
class SomeClass
{
public function run()
{
- $value = $this->getOne();
+ $this->getOne();
}
private function getOne(): void
{
}
}
```
<br>
### RemoveCodeAfterReturnRector
Remove dead code after return statement
@ -7990,9 +7967,10 @@ Change simple property init and assign to constructor promotion
{
- public float $someVariable;
-
- public function __construct(float $someVariable = 0.0)
+ public function __construct(private float $someVariable = 0.0)
{
public function __construct(
- float $someVariable = 0.0
+ private float $someVariable = 0.0
) {
- $this->someVariable = $someVariable;
}
}

87
rules/DeadCode/Rector/Assign/RemoveAssignOfVoidReturnFunctionRector.php
View File

@ -1,87 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\DeadCode\Rector\Assign;
use PhpParser\Node;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\Variable;
use PHPStan\Type\VoidType;
use Rector\Core\Rector\AbstractRector;
use Rector\DeadCode\NodeAnalyzer\ExprUsedInNextNodeAnalyzer;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
* @see \Rector\Tests\DeadCode\Rector\Assign\RemoveAssignOfVoidReturnFunctionRector\RemoveAssignOfVoidReturnFunctionRectorTest
*/
final class RemoveAssignOfVoidReturnFunctionRector extends \Rector\Core\Rector\AbstractRector
{
/**
* @var \Rector\DeadCode\NodeAnalyzer\ExprUsedInNextNodeAnalyzer
*/
private $exprUsedInNextNodeAnalyzer;
public function __construct(\Rector\DeadCode\NodeAnalyzer\ExprUsedInNextNodeAnalyzer $exprUsedInNextNodeAnalyzer)
{
$this->exprUsedInNextNodeAnalyzer = $exprUsedInNextNodeAnalyzer;
}
public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
{
return new \Symplify\RuleDocGenerator\ValueObject\RuleDefinition('Remove assign of void function/method to variable', [new \Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample(<<<'CODE_SAMPLE'
class SomeClass
{
public function run()
{
$value = $this->getOne();
}
private function getOne(): void
{
}
}
CODE_SAMPLE
, <<<'CODE_SAMPLE'
class SomeClass
{
public function run()
{
$this->getOne();
}
private function getOne(): void
{
}
}
CODE_SAMPLE
)]);
}
/**
* @return array<class-string<Node>>
*/
public function getNodeTypes() : array
{
return [\PhpParser\Node\Expr\Assign::class];
}
/**
* @param Assign $node
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
if (!$node->expr instanceof \PhpParser\Node\Expr\FuncCall && !$node->expr instanceof \PhpParser\Node\Expr\MethodCall && !$node->expr instanceof \PhpParser\Node\Expr\StaticCall) {
return null;
}
if (!$node->var instanceof \PhpParser\Node\Expr\Variable) {
return null;
}
if ($this->exprUsedInNextNodeAnalyzer->isUsed($node->var, \true)) {
return null;
}
$exprType = $this->nodeTypeResolver->getType($node->expr);
if (!$exprType instanceof \PHPStan\Type\VoidType) {
return null;
}
return $node->expr;
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '51d369a46c80ac874a3203e618f5a50845e253a0';
public const PACKAGE_VERSION = 'aa721665058cd250bca2b6592dbeffd1e5ad1f98';
/**
* @var string
*/
public const RELEASE_DATE = '2021-11-25 18:55:10';
public const RELEASE_DATE = '2021-11-25 19:03:04';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211125\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitf7ab29832e58af6460f36431a817a4b4::getLoader();
return ComposerAutoloaderInit0e6c3ab496bf28ae5ef2fde5d7cb27e9::getLoader();

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1803,7 +1803,6 @@ return array(
'Rector\\DeadCode\\PhpDoc\\TagRemover\\ReturnTagRemover' => $baseDir . '/rules/DeadCode/PhpDoc/TagRemover/ReturnTagRemover.php',
'Rector\\DeadCode\\PhpDoc\\TagRemover\\VarTagRemover' => $baseDir . '/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php',
'Rector\\DeadCode\\Rector\\Array_\\RemoveDuplicatedArrayKeyRector' => $baseDir . '/rules/DeadCode/Rector/Array_/RemoveDuplicatedArrayKeyRector.php',
'Rector\\DeadCode\\Rector\\Assign\\RemoveAssignOfVoidReturnFunctionRector' => $baseDir . '/rules/DeadCode/Rector/Assign/RemoveAssignOfVoidReturnFunctionRector.php',
'Rector\\DeadCode\\Rector\\Assign\\RemoveDoubleAssignRector' => $baseDir . '/rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php',
'Rector\\DeadCode\\Rector\\Assign\\RemoveUnusedAssignVariableRector' => $baseDir . '/rules/DeadCode/Rector/Assign/RemoveUnusedAssignVariableRector.php',
'Rector\\DeadCode\\Rector\\Assign\\RemoveUnusedVariableAssignRector' => $baseDir . '/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitf7ab29832e58af6460f36431a817a4b4
class ComposerAutoloaderInit0e6c3ab496bf28ae5ef2fde5d7cb27e9
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitf7ab29832e58af6460f36431a817a4b4
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitf7ab29832e58af6460f36431a817a4b4', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit0e6c3ab496bf28ae5ef2fde5d7cb27e9', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitf7ab29832e58af6460f36431a817a4b4', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit0e6c3ab496bf28ae5ef2fde5d7cb27e9', '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\ComposerStaticInitf7ab29832e58af6460f36431a817a4b4::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit0e6c3ab496bf28ae5ef2fde5d7cb27e9::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInitf7ab29832e58af6460f36431a817a4b4
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitf7ab29832e58af6460f36431a817a4b4::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit0e6c3ab496bf28ae5ef2fde5d7cb27e9::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiref7ab29832e58af6460f36431a817a4b4($fileIdentifier, $file);
composerRequire0e6c3ab496bf28ae5ef2fde5d7cb27e9($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequiref7ab29832e58af6460f36431a817a4b4($fileIdentifier, $file)
function composerRequire0e6c3ab496bf28ae5ef2fde5d7cb27e9($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitf7ab29832e58af6460f36431a817a4b4
class ComposerStaticInit0e6c3ab496bf28ae5ef2fde5d7cb27e9
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -2200,7 +2200,6 @@ class ComposerStaticInitf7ab29832e58af6460f36431a817a4b4
'Rector\\DeadCode\\PhpDoc\\TagRemover\\ReturnTagRemover' => __DIR__ . '/../..' . '/rules/DeadCode/PhpDoc/TagRemover/ReturnTagRemover.php',
'Rector\\DeadCode\\PhpDoc\\TagRemover\\VarTagRemover' => __DIR__ . '/../..' . '/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php',
'Rector\\DeadCode\\Rector\\Array_\\RemoveDuplicatedArrayKeyRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Array_/RemoveDuplicatedArrayKeyRector.php',
'Rector\\DeadCode\\Rector\\Assign\\RemoveAssignOfVoidReturnFunctionRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Assign/RemoveAssignOfVoidReturnFunctionRector.php',
'Rector\\DeadCode\\Rector\\Assign\\RemoveDoubleAssignRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php',
'Rector\\DeadCode\\Rector\\Assign\\RemoveUnusedAssignVariableRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Assign/RemoveUnusedAssignVariableRector.php',
'Rector\\DeadCode\\Rector\\Assign\\RemoveUnusedVariableAssignRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php',
@ -3765,9 +3764,9 @@ class ComposerStaticInitf7ab29832e58af6460f36431a817a4b4
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitf7ab29832e58af6460f36431a817a4b4::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitf7ab29832e58af6460f36431a817a4b4::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitf7ab29832e58af6460f36431a817a4b4::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit0e6c3ab496bf28ae5ef2fde5d7cb27e9::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0e6c3ab496bf28ae5ef2fde5d7cb27e9::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0e6c3ab496bf28ae5ef2fde5d7cb27e9::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -12,8 +12,8 @@ if (!class_exists('GenerateChangelogCommand', false) && !interface_exists('Gener
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20211125\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitf7ab29832e58af6460f36431a817a4b4', false) && !interface_exists('ComposerAutoloaderInitf7ab29832e58af6460f36431a817a4b4', false) && !trait_exists('ComposerAutoloaderInitf7ab29832e58af6460f36431a817a4b4', false)) {
spl_autoload_call('RectorPrefix20211125\ComposerAutoloaderInitf7ab29832e58af6460f36431a817a4b4');
if (!class_exists('ComposerAutoloaderInit0e6c3ab496bf28ae5ef2fde5d7cb27e9', false) && !interface_exists('ComposerAutoloaderInit0e6c3ab496bf28ae5ef2fde5d7cb27e9', false) && !trait_exists('ComposerAutoloaderInit0e6c3ab496bf28ae5ef2fde5d7cb27e9', false)) {
spl_autoload_call('RectorPrefix20211125\ComposerAutoloaderInit0e6c3ab496bf28ae5ef2fde5d7cb27e9');
}
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('RectorPrefix20211125\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -81,9 +81,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211125\print_node(...func_get_args());
}
}
if (!function_exists('composerRequiref7ab29832e58af6460f36431a817a4b4')) {
function composerRequiref7ab29832e58af6460f36431a817a4b4() {
return \RectorPrefix20211125\composerRequiref7ab29832e58af6460f36431a817a4b4(...func_get_args());
if (!function_exists('composerRequire0e6c3ab496bf28ae5ef2fde5d7cb27e9')) {
function composerRequire0e6c3ab496bf28ae5ef2fde5d7cb27e9() {
return \RectorPrefix20211125\composerRequire0e6c3ab496bf28ae5ef2fde5d7cb27e9(...func_get_args());
}
}
if (!function_exists('scanPath')) {