Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Fixture;

use Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Source\SomeMultiArg;

class SkipNamedArguments
{
public function run()
{
$obj = new SomeMultiArg();
$obj->run(b: 5);
$obj->run(c: 4);
$obj->run(0, 1, c: 6);
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

namespace Rector\Tests\Arguments\Rector\ClassMethod\ReplaceArgumentDefaultValueRector\Fixture;

use Rector\Tests\Arguments\Rector\ClassMethod\ReplaceArgumentDefaultValueRector\Fixture\ReplaceMethodArgumentWithConstant;

class SkipNamedArguments
{
public function run()
{
$obj = new ReplaceMethodArgumentWithConstant();
$obj->setSomeMethod(someValue: 'some value');
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php

namespace Rector\Tests\Arguments\Rector\FuncCall\FunctionArgumentDefaultValueReplacerRector\Fixture;

class SkipNamedArguments
{
public function run()
{
version_compare(version1: '5.6', version2: PHP_VERSION, operator: 'lte');
version_compare('5.6', PHP_VERSION, operator: 'lte');
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

namespace Rector\Tests\Arguments\Rector\MethodCall\RemoveMethodCallParamRector\Fixture;

use Rector\Tests\Arguments\Rector\MethodCall\RemoveMethodCallParamRector\Source\MethodCaller;

final class SkipNamedArguments
{
public function run(MethodCaller $caller)
{
$caller->process(first: 1, second: 2);
$caller->process(1, second: 2);
}
}
8 changes: 7 additions & 1 deletion rules/Arguments/ArgumentDefaultValueReplacer.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@
use PhpParser\Node\Stmt\ClassMethod;
use Rector\Arguments\Contract\ReplaceArgumentDefaultValueInterface;
use Rector\Arguments\ValueObject\ReplaceArgumentDefaultValue;
use Rector\NodeAnalyzer\ArgsAnalyzer;
use Rector\PhpParser\Node\NodeFactory;
use Rector\PhpParser\Node\Value\ValueResolver;

final readonly class ArgumentDefaultValueReplacer
{
public function __construct(
private NodeFactory $nodeFactory,
private ValueResolver $valueResolver
private ValueResolver $valueResolver,
private ArgsAnalyzer $argsAnalyzer
) {
}

Expand Down Expand Up @@ -101,6 +103,10 @@ private function processArgs(
return null;
}

if ($this->argsAnalyzer->hasNamedArg($expr->getArgs())) {
return null;
}

$position = $replaceArgumentDefaultValue->getPosition();
$particularArg = $expr->getArgs()[$position] ?? null;
if (! $particularArg instanceof Arg) {
Expand Down
8 changes: 7 additions & 1 deletion rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
use Rector\Contract\Rector\ConfigurableRectorInterface;
use Rector\Enum\ObjectReference;
use Rector\Exception\ShouldNotHappenException;
use Rector\NodeAnalyzer\ArgsAnalyzer;
use Rector\PhpParser\AstResolver;
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
use Rector\Rector\AbstractRector;
Expand All @@ -48,7 +49,8 @@ public function __construct(
private readonly ArgumentAddingScope $argumentAddingScope,
private readonly ChangedArgumentsDetector $changedArgumentsDetector,
private readonly AstResolver $astResolver,
private readonly StaticTypeMapper $staticTypeMapper
private readonly StaticTypeMapper $staticTypeMapper,
private readonly ArgsAnalyzer $argsAnalyzer
) {
}

Expand Down Expand Up @@ -249,6 +251,10 @@ private function shouldSkipParameter(
return $this->changedArgumentsDetector->isTypeChanged($param, $argumentAdder->getArgumentType());
}

if ($this->argsAnalyzer->hasNamedArg($node->getArgs())) {
return true;
}

if (isset($node->args[$position])) {
return true;
}
Expand Down
10 changes: 10 additions & 0 deletions rules/Arguments/Rector/MethodCall/RemoveMethodCallParamRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use PhpParser\Node\Expr\StaticCall;
use Rector\Arguments\ValueObject\RemoveMethodCallParam;
use Rector\Contract\Rector\ConfigurableRectorInterface;
use Rector\NodeAnalyzer\ArgsAnalyzer;
use Rector\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
Expand All @@ -25,6 +26,11 @@ final class RemoveMethodCallParamRector extends AbstractRector implements Config
*/
private array $removeMethodCallParams = [];

public function __construct(
private readonly ArgsAnalyzer $argsAnalyzer,
) {
}

public function getRuleDefinition(): RuleDefinition
{
return new RuleDefinition('Remove parameter of method call', [
Expand Down Expand Up @@ -73,6 +79,10 @@ public function refactor(Node $node): ?Node
return null;
}

if ($this->argsAnalyzer->hasNamedArg($node->getArgs())) {
return null;
}

foreach ($this->removeMethodCallParams as $removeMethodCallParam) {
if (! $this->isName($node->name, $removeMethodCallParam->getMethodName())) {
continue;
Expand Down