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 debe56260b932715c63eacc73c5495c276784a1c

Browse Source 
debe56260b simplify rule docs config
This commit is contained in:
Tomas Votruba 2022-08-24 08:53:31 +00:00
parent 0e5ee3dc93
commit 87509424bf
9 changed files with 29 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@ use Rector\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector;
use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector;
use Rector\DeadCode\Rector\ClassMethod\RemoveLastReturnRector;
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector;
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedParamInRequiredAutowireRector;
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector;
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
@ -89,7 +88,6 @@ return static function (RectorConfig $rectorConfig) : void {
RemoveDeadInstanceOfRector::class,
RemoveDeadLoopRector::class,
RemoveUnusedPrivateMethodParameterRector::class,
RemoveUnusedParamInRequiredAutowireRector::class,
// docblock
RemoveUselessParamTagRector::class,
RemoveUselessReturnTagRector::class,

33
docs/rector_rules_overview.md
View File

@ -1,4 +1,4 @@
# 409 Rules Overview
# 408 Rules Overview
<br>
@ -14,7 +14,7 @@
- [Composer](#composer) (6)
- [DeadCode](#deadcode) (48)
- [DeadCode](#deadcode) (47)
- [DependencyInjection](#dependencyinjection) (2)
@ -3440,29 +3440,6 @@ Remove unused if check to non-empty array before foreach of the array
<br>
### RemoveUnusedParamInRequiredAutowireRector
Remove unused parameter in required autowire method
- class: [`Rector\DeadCode\Rector\ClassMethod\RemoveUnusedParamInRequiredAutowireRector`](../rules/DeadCode/Rector/ClassMethod/RemoveUnusedParamInRequiredAutowireRector.php)
```diff
use Symfony\Contracts\Service\Attribute\Required;
final class SomeService
{
private $visibilityManipulator;
#[Required]
- public function autowire(VisibilityManipulator $visibilityManipulator)
+ public function autowire()
{
}
}
```
<br>
### RemoveUnusedPrivateClassConstantRector
Remove unused class constants
@ -3682,14 +3659,14 @@ Remove if/else if they have same content
### SimplifyMirrorAssignRector
Removes unneeded $a = $a assigns
Removes unneeded `$value` = `$value` assigns
- class: [`Rector\DeadCode\Rector\Expression\SimplifyMirrorAssignRector`](../rules/DeadCode/Rector/Expression/SimplifyMirrorAssignRector.php)
```diff
function run() {
- $a = $a;
}
- $result = $result;
}
```
<br>

101
rules/DeadCode/Rector/ClassMethod/RemoveUnusedParamInRequiredAutowireRector.php
View File

@ -1,101 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\DeadCode\Rector\ClassMethod;
use PhpParser\Node;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\ClassMethod;
use Rector\Core\Rector\AbstractRector;
use Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
* @see \Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedParamInRequiredAutowireRector\RemoveUnusedParamInRequiredAutowireRectorTest
*/
final class RemoveUnusedParamInRequiredAutowireRector extends AbstractRector
{
/**
* @readonly
* @var \Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer
*/
private $phpAttributeAnalyzer;
public function __construct(PhpAttributeAnalyzer $phpAttributeAnalyzer)
{
$this->phpAttributeAnalyzer = $phpAttributeAnalyzer;
}
public function getRuleDefinition() : RuleDefinition
{
return new RuleDefinition('Remove unused parameter in required autowire method', [new CodeSample(<<<'CODE_SAMPLE'
use Symfony\Contracts\Service\Attribute\Required;
final class SomeService
{
private $visibilityManipulator;
#[Required]
public function autowire(VisibilityManipulator $visibilityManipulator)
{
}
}
CODE_SAMPLE
, <<<'CODE_SAMPLE'
use Symfony\Contracts\Service\Attribute\Required;
final class SomeService
{
private $visibilityManipulator;
#[Required]
public function autowire()
{
}
}
CODE_SAMPLE
)]);
}
/**
* @return array<class-string<Node>>
*/
public function getNodeTypes() : array
{
return [ClassMethod::class];
}
/**
* @param ClassMethod $node
*/
public function refactor(Node $node) : ?Node
{
if ($this->shouldSkip($node)) {
return null;
}
$params = $node->params;
if ($params === []) {
return null;
}
/** @var Variable[] $variables */
$variables = $this->betterNodeFinder->findInstanceOf((array) $node->getStmts(), Variable::class);
$hasRemovedParam = \false;
foreach ($params as $param) {
$paramVar = $param->var;
foreach ($variables as $variable) {
if ($this->nodeComparator->areNodesEqual($variable, $paramVar)) {
continue 2;
}
}
$this->removeNode($param);
$hasRemovedParam = \true;
}
if (!$hasRemovedParam) {
return null;
}
return $node;
}
private function shouldSkip(ClassMethod $classMethod) : bool
{
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($classMethod);
$hasRequiredAnnotation = $phpDocInfo->hasByName('required');
$hasRequiredAttribute = $this->phpAttributeAnalyzer->hasPhpAttribute($classMethod, 'Symfony\\Contracts\\Service\\Attribute\\Required');
return !$hasRequiredAnnotation && !$hasRequiredAttribute;
}
}

14
rules/DeadCode/Rector/Expression/SimplifyMirrorAssignRector.php
View File

@ -16,10 +16,16 @@ final class SimplifyMirrorAssignRector extends AbstractRector
{
public function getRuleDefinition() : RuleDefinition
{
return new RuleDefinition('Removes unneeded $a = $a assigns', [new CodeSample('function run() {
$a = $a;
}', 'function run() {
}')]);
return new RuleDefinition('Removes unneeded $value = $value assigns', [new CodeSample(<<<'CODE_SAMPLE'
function run() {
$result = $result;
}
CODE_SAMPLE
, <<<'CODE_SAMPLE'
function run() {
}
CODE_SAMPLE
)]);
}
/**
* @return array<class-string<Node>>

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '6c8c40bb746ce70ab8faa7e80ae088edaba771e7';
public const PACKAGE_VERSION = 'debe56260b932715c63eacc73c5495c276784a1c';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-08-24 10:39:04';
public const RELEASE_DATE = '2022-08-24 10:49:30';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1665,7 +1665,6 @@ return array(
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveEmptyClassMethodRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveLastReturnRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveLastReturnRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedConstructorParamRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedParamInRequiredAutowireRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedParamInRequiredAutowireRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedPrivateMethodParameterRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedPrivateMethodRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedPromotedPropertyRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit0aec6cd0ff6700b07aec486881ed9118
class ComposerAutoloaderInitf9e815e5b59696f4e56852d203d61166
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit0aec6cd0ff6700b07aec486881ed9118
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit0aec6cd0ff6700b07aec486881ed9118', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitf9e815e5b59696f4e56852d203d61166', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit0aec6cd0ff6700b07aec486881ed9118', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitf9e815e5b59696f4e56852d203d61166', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit0aec6cd0ff6700b07aec486881ed9118::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitf9e815e5b59696f4e56852d203d61166::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit0aec6cd0ff6700b07aec486881ed9118::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitf9e815e5b59696f4e56852d203d61166::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire0aec6cd0ff6700b07aec486881ed9118($fileIdentifier, $file);
composerRequiref9e815e5b59696f4e56852d203d61166($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit0aec6cd0ff6700b07aec486881ed9118
* @param string $file
* @return void
*/
function composerRequire0aec6cd0ff6700b07aec486881ed9118($fileIdentifier, $file)
function composerRequiref9e815e5b59696f4e56852d203d61166($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit0aec6cd0ff6700b07aec486881ed9118
class ComposerStaticInitf9e815e5b59696f4e56852d203d61166
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -1962,7 +1962,6 @@ class ComposerStaticInit0aec6cd0ff6700b07aec486881ed9118
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveEmptyClassMethodRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveLastReturnRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveLastReturnRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedConstructorParamRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedParamInRequiredAutowireRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedParamInRequiredAutowireRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedPrivateMethodParameterRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedPrivateMethodRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector.php',
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedPromotedPropertyRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector.php',
@ -3258,9 +3257,9 @@ class ComposerStaticInit0aec6cd0ff6700b07aec486881ed9118
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit0aec6cd0ff6700b07aec486881ed9118::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0aec6cd0ff6700b07aec486881ed9118::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0aec6cd0ff6700b07aec486881ed9118::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitf9e815e5b59696f4e56852d203d61166::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitf9e815e5b59696f4e56852d203d61166::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitf9e815e5b59696f4e56852d203d61166::$classMap;
}, null, ClassLoader::class);
}