Skip to content

Commit b7397c0

Browse files
committed
fix cs
1 parent 3e54020 commit b7397c0

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

src/AddNamedArgumentsRector.php

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
namespace SavinMikhail\AddNamedArgumentsRector;
66

77
use InvalidArgumentException;
8-
use PhpParser\Node;
98
use PhpParser\ConstExprEvaluator;
9+
use PhpParser\Node;
1010
use PhpParser\Node\Arg;
1111
use PhpParser\Node\Expr\FuncCall;
1212
use PhpParser\Node\Expr\MethodCall;
@@ -15,20 +15,25 @@
1515
use PhpParser\Node\Identifier;
1616
use PHPStan\Reflection\ExtendedParameterReflection;
1717
use PHPStan\Reflection\ReflectionProvider;
18+
use PHPStan\Type\ConstantScalarType;
1819
use Rector\Contract\Rector\ConfigurableRectorInterface;
1920
use Rector\NodeNameResolver\NodeNameResolver;
2021
use Rector\NodeTypeResolver\NodeTypeResolver;
2122
use Rector\Rector\AbstractRector;
2223
use Rector\ValueObject\PhpVersion;
2324
use Rector\VersionBonding\Contract\MinPhpVersionInterface;
25+
use RuntimeException;
2426
use SavinMikhail\AddNamedArgumentsRector\Config\ConfigStrategy;
2527
use SavinMikhail\AddNamedArgumentsRector\Config\DefaultStrategy;
2628
use SavinMikhail\AddNamedArgumentsRector\Reflection\Reflection;
2729
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
2830
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
31+
use Throwable;
2932
use Webmozart\Assert\Assert;
3033

34+
use function constant;
3135
use function count;
36+
use function defined;
3237

3338
/**
3439
* @see AddNamedArgumentsRectorTest
@@ -57,11 +62,11 @@ public function __construct(
5762
}
5863
$this->reflectionService = $reflectionService;
5964
$this->constExprEvaluator = $constExprEvaluator ?? new ConstExprEvaluator(static function (string $name) {
60-
if (\defined($name)) {
61-
return \constant($name);
65+
if (defined($name)) {
66+
return constant($name);
6267
}
6368

64-
throw new \RuntimeException("Undefined constant: {$name}");
69+
throw new RuntimeException("Undefined constant: {$name}");
6570
});
6671
}
6772

@@ -107,6 +112,7 @@ private function addNamesToArgs(
107112
$parameter = $parameters[$index] ?? null;
108113
if ($parameter === null) {
109114
$namedArgs[] = $arg;
115+
110116
continue;
111117
}
112118

@@ -125,19 +131,20 @@ private function shouldSkipArg(Arg $arg, ExtendedParameterReflection $parameter)
125131
{
126132
try {
127133
$defaultValue = $parameter->getDefaultValue();
128-
} catch (\Throwable) {
134+
} catch (Throwable) {
129135
return false;
130136
}
131137

132138
try {
133139
$argValue = $this->constExprEvaluator->evaluateDirectly($arg->value);
134-
} catch (\Throwable) {
140+
} catch (Throwable) {
135141
return false;
136142
}
137143

138-
if ($defaultValue instanceof \PHPStan\Type\ConstantScalarType) {
144+
if ($defaultValue instanceof ConstantScalarType) {
139145
$defaultValue = $defaultValue->getValue();
140146
}
147+
141148
return $argValue === $defaultValue;
142149
}
143150

src/Reflection/ParameterReflection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
{
2424
public function __construct(
2525
private ReflectionProvider $reflectionProvider,
26-
protected NodeNameResolver $nodeNameResolver,
27-
protected NodeTypeResolver $nodeTypeResolver,
26+
private NodeNameResolver $nodeNameResolver,
27+
private NodeTypeResolver $nodeTypeResolver,
2828
) {}
2929

3030
/**

src/Reflection/Reflection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
public function __construct(
2727
private ReflectionProvider $reflectionProvider,
28-
protected NodeNameResolver $nodeNameResolver,
29-
protected NodeTypeResolver $nodeTypeResolver,
28+
private NodeNameResolver $nodeNameResolver,
29+
private NodeTypeResolver $nodeTypeResolver,
3030
?ParameterReflection $parameterReflection = null,
3131
) {
3232
if ($parameterReflection === null) {

tests/DefaultStrategy/AddNamedArgumentsRectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function test(string $filePath): void
2020
/**
2121
* @return Iterator<array<int, string>>
2222
*/
23-
public static function provideCases(): Iterator
23+
public static function provideCases(): iterable
2424
{
2525
return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
2626
}

0 commit comments

Comments
 (0)