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

Updated Rector to commit 3948d8b1d4

Browse Source 
3948d8b1d4 [Arguments] Add RemoveMethodCallParamRector (#1906)
This commit is contained in:
Tomas Votruba 2022-03-05 11:39:32 +00:00
parent 63e7bd57f7
commit 41d47ce22b
9 changed files with 188 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
docs/rector_rules_overview.md
View File

@ -1,10 +1,10 @@
# 505 Rules Overview
# 506 Rules Overview
<br>
## Categories
- [Arguments](#arguments) (4)
- [Arguments](#arguments) (5)
- [CodeQuality](#codequality) (71)
@ -170,6 +170,42 @@ return static function (ContainerConfigurator $containerConfigurator): void {
<br>
### RemoveMethodCallParamRector
Remove parameter of method call
:wrench: **configure it!**
- class: [`Rector\Arguments\Rector\MethodCall\RemoveMethodCallParamRector`](../rules/Arguments/Rector/MethodCall/RemoveMethodCallParamRector.php)
```php
use Rector\Arguments\Rector\MethodCall\RemoveMethodCallParamRector;
use Rector\Arguments\ValueObject\RemoveMethodCallParam;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();
$services->set(RemoveMethodCallParamRector::class)
->configure([new RemoveMethodCallParam('Caller', 'process', 1)]);
};
```
↓
```diff
final class SomeClass
{
public function run(Caller $caller)
{
- $caller->process(1, 2);
+ $caller->process(1);
}
}
```
<br>
### ReplaceArgumentDefaultValueRector
Replaces defined map of arguments in defined methods and their calls.

85
rules/Arguments/Rector/MethodCall/RemoveMethodCallParamRector.php Normal file
View File

@ -0,0 +1,85 @@
<?php
declare (strict_types=1);
namespace Rector\Arguments\Rector\MethodCall;
use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
use Rector\Arguments\ValueObject\RemoveMethodCallParam;
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
use Rector\Core\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use RectorPrefix20220305\Webmozart\Assert\Assert;
/**
* @see \Rector\Tests\Arguments\Rector\MethodCall\RemoveMethodCallParamRector\RemoveMethodCallParamRectorTest
*/
final class RemoveMethodCallParamRector extends \Rector\Core\Rector\AbstractRector implements \Rector\Core\Contract\Rector\ConfigurableRectorInterface
{
/**
* @var RemoveMethodCallParam[]
*/
private $removeMethodCallParams = [];
public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
{
return new \Symplify\RuleDocGenerator\ValueObject\RuleDefinition('Remove parameter of method call', [new \Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample(<<<'CODE_SAMPLE'
final class SomeClass
{
public function run(Caller $caller)
{
$caller->process(1, 2);
}
}
CODE_SAMPLE
, <<<'CODE_SAMPLE'
final class SomeClass
{
public function run(Caller $caller)
{
$caller->process(1);
}
}
CODE_SAMPLE
, [new \Rector\Arguments\ValueObject\RemoveMethodCallParam('Caller', 'process', 1)])]);
}
/**
* @return array<class-string<Node>>
*/
public function getNodeTypes() : array
{
return [\PhpParser\Node\Expr\MethodCall::class];
}
/**
* @param MethodCall $node
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
$hasChanged = \false;
foreach ($this->removeMethodCallParams as $removeMethodCallParam) {
if (!$this->isName($node->name, $removeMethodCallParam->getMethodName())) {
continue;
}
if (!$this->isObjectType($node->var, $removeMethodCallParam->getObjectType())) {
continue;
}
$args = $node->getArgs();
if (!isset($args[$removeMethodCallParam->getParamPosition()])) {
continue;
}
unset($node->args[$removeMethodCallParam->getParamPosition()]);
$hasChanged = \true;
}
if (!$hasChanged) {
return null;
}
return $node;
}
/**
* @param mixed[] $configuration
*/
public function configure(array $configuration) : void
{
\RectorPrefix20220305\Webmozart\Assert\Assert::allIsInstanceOf($configuration, \Rector\Arguments\ValueObject\RemoveMethodCallParam::class);
$this->removeMethodCallParams = $configuration;
}
}

42
rules/Arguments/ValueObject/RemoveMethodCallParam.php Normal file
View File

@ -0,0 +1,42 @@
<?php
declare (strict_types=1);
namespace Rector\Arguments\ValueObject;
use PHPStan\Type\ObjectType;
final class RemoveMethodCallParam
{
/**
* @readonly
* @var string
*/
private $class;
/**
* @readonly
* @var string
*/
private $methodName;
/**
* @readonly
* @var int
*/
private $paramPosition;
public function __construct(string $class, string $methodName, int $paramPosition)
{
$this->class = $class;
$this->methodName = $methodName;
$this->paramPosition = $paramPosition;
}
public function getObjectType() : \PHPStan\Type\ObjectType
{
return new \PHPStan\Type\ObjectType($this->class);
}
public function getMethodName() : string
{
return $this->methodName;
}
public function getParamPosition() : int
{
return $this->paramPosition;
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '00e857f07e0b09ac69fa404820b20514c79a7376';
public const PACKAGE_VERSION = '3948d8b1d43ac7732a269d2e679d7b7541532501';
/**
* @var string
*/
public const RELEASE_DATE = '2022-03-05 10:52:44';
public const RELEASE_DATE = '2022-03-05 11:33:32';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20220305\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 ComposerAutoloaderInitdd9b122ef49e82fe057eabfc03fc6cdc::getLoader();
return ComposerAutoloaderInit981ff19f23011fd3ed14c862e30d2892::getLoader();

2
vendor/composer/autoload_classmap.php vendored
View File

@ -1366,7 +1366,9 @@ return array(
'Rector\\Arguments\\Rector\\ClassMethod\\ReplaceArgumentDefaultValueRector' => $baseDir . '/rules/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector.php',
'Rector\\Arguments\\Rector\\FuncCall\\FunctionArgumentDefaultValueReplacerRector' => $baseDir . '/rules/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector.php',
'Rector\\Arguments\\Rector\\FuncCall\\SwapFuncCallArgumentsRector' => $baseDir . '/rules/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector.php',
'Rector\\Arguments\\Rector\\MethodCall\\RemoveMethodCallParamRector' => $baseDir . '/rules/Arguments/Rector/MethodCall/RemoveMethodCallParamRector.php',
'Rector\\Arguments\\ValueObject\\ArgumentAdder' => $baseDir . '/rules/Arguments/ValueObject/ArgumentAdder.php',
'Rector\\Arguments\\ValueObject\\RemoveMethodCallParam' => $baseDir . '/rules/Arguments/ValueObject/RemoveMethodCallParam.php',
'Rector\\Arguments\\ValueObject\\ReplaceArgumentDefaultValue' => $baseDir . '/rules/Arguments/ValueObject/ReplaceArgumentDefaultValue.php',
'Rector\\Arguments\\ValueObject\\ReplaceFuncCallArgumentDefaultValue' => $baseDir . '/rules/Arguments/ValueObject/ReplaceFuncCallArgumentDefaultValue.php',
'Rector\\Arguments\\ValueObject\\SwapFuncCallArguments' => $baseDir . '/rules/Arguments/ValueObject/SwapFuncCallArguments.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitdd9b122ef49e82fe057eabfc03fc6cdc
class ComposerAutoloaderInit981ff19f23011fd3ed14c862e30d2892
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitdd9b122ef49e82fe057eabfc03fc6cdc
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitdd9b122ef49e82fe057eabfc03fc6cdc', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit981ff19f23011fd3ed14c862e30d2892', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitdd9b122ef49e82fe057eabfc03fc6cdc', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit981ff19f23011fd3ed14c862e30d2892', '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\ComposerStaticInitdd9b122ef49e82fe057eabfc03fc6cdc::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit981ff19f23011fd3ed14c862e30d2892::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,12 +42,12 @@ class ComposerAutoloaderInitdd9b122ef49e82fe057eabfc03fc6cdc
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitdd9b122ef49e82fe057eabfc03fc6cdc::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit981ff19f23011fd3ed14c862e30d2892::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiredd9b122ef49e82fe057eabfc03fc6cdc($fileIdentifier, $file);
composerRequire981ff19f23011fd3ed14c862e30d2892($fileIdentifier, $file);
}
return $loader;
@ -59,7 +59,7 @@ class ComposerAutoloaderInitdd9b122ef49e82fe057eabfc03fc6cdc
* @param string $file
* @return void
*/
function composerRequiredd9b122ef49e82fe057eabfc03fc6cdc($fileIdentifier, $file)
function composerRequire981ff19f23011fd3ed14c862e30d2892($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

10
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitdd9b122ef49e82fe057eabfc03fc6cdc
class ComposerStaticInit981ff19f23011fd3ed14c862e30d2892
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -1740,7 +1740,9 @@ class ComposerStaticInitdd9b122ef49e82fe057eabfc03fc6cdc
'Rector\\Arguments\\Rector\\ClassMethod\\ReplaceArgumentDefaultValueRector' => __DIR__ . '/../..' . '/rules/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector.php',
'Rector\\Arguments\\Rector\\FuncCall\\FunctionArgumentDefaultValueReplacerRector' => __DIR__ . '/../..' . '/rules/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector.php',
'Rector\\Arguments\\Rector\\FuncCall\\SwapFuncCallArgumentsRector' => __DIR__ . '/../..' . '/rules/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector.php',
'Rector\\Arguments\\Rector\\MethodCall\\RemoveMethodCallParamRector' => __DIR__ . '/../..' . '/rules/Arguments/Rector/MethodCall/RemoveMethodCallParamRector.php',
'Rector\\Arguments\\ValueObject\\ArgumentAdder' => __DIR__ . '/../..' . '/rules/Arguments/ValueObject/ArgumentAdder.php',
'Rector\\Arguments\\ValueObject\\RemoveMethodCallParam' => __DIR__ . '/../..' . '/rules/Arguments/ValueObject/RemoveMethodCallParam.php',
'Rector\\Arguments\\ValueObject\\ReplaceArgumentDefaultValue' => __DIR__ . '/../..' . '/rules/Arguments/ValueObject/ReplaceArgumentDefaultValue.php',
'Rector\\Arguments\\ValueObject\\ReplaceFuncCallArgumentDefaultValue' => __DIR__ . '/../..' . '/rules/Arguments/ValueObject/ReplaceFuncCallArgumentDefaultValue.php',
'Rector\\Arguments\\ValueObject\\SwapFuncCallArguments' => __DIR__ . '/../..' . '/rules/Arguments/ValueObject/SwapFuncCallArguments.php',
@ -3832,9 +3834,9 @@ class ComposerStaticInitdd9b122ef49e82fe057eabfc03fc6cdc
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitdd9b122ef49e82fe057eabfc03fc6cdc::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitdd9b122ef49e82fe057eabfc03fc6cdc::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitdd9b122ef49e82fe057eabfc03fc6cdc::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit981ff19f23011fd3ed14c862e30d2892::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit981ff19f23011fd3ed14c862e30d2892::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit981ff19f23011fd3ed14c862e30d2892::$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('RectorPrefix20220305\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitdd9b122ef49e82fe057eabfc03fc6cdc', false) && !interface_exists('ComposerAutoloaderInitdd9b122ef49e82fe057eabfc03fc6cdc', false) && !trait_exists('ComposerAutoloaderInitdd9b122ef49e82fe057eabfc03fc6cdc', false)) {
spl_autoload_call('RectorPrefix20220305\ComposerAutoloaderInitdd9b122ef49e82fe057eabfc03fc6cdc');
if (!class_exists('ComposerAutoloaderInit981ff19f23011fd3ed14c862e30d2892', false) && !interface_exists('ComposerAutoloaderInit981ff19f23011fd3ed14c862e30d2892', false) && !trait_exists('ComposerAutoloaderInit981ff19f23011fd3ed14c862e30d2892', false)) {
spl_autoload_call('RectorPrefix20220305\ComposerAutoloaderInit981ff19f23011fd3ed14c862e30d2892');
}
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('RectorPrefix20220305\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220305\print_node(...func_get_args());
}
}
if (!function_exists('composerRequiredd9b122ef49e82fe057eabfc03fc6cdc')) {
function composerRequiredd9b122ef49e82fe057eabfc03fc6cdc() {
return \RectorPrefix20220305\composerRequiredd9b122ef49e82fe057eabfc03fc6cdc(...func_get_args());
if (!function_exists('composerRequire981ff19f23011fd3ed14c862e30d2892')) {
function composerRequire981ff19f23011fd3ed14c862e30d2892() {
return \RectorPrefix20220305\composerRequire981ff19f23011fd3ed14c862e30d2892(...func_get_args());
}
}
if (!function_exists('scanPath')) {