Skip to content

Commit 41c22b8

Browse files
committed
[ci-review] Rector Rectify
1 parent 7d4f22c commit 41c22b8

4 files changed

Lines changed: 11 additions & 31 deletions

File tree

rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Rector\DeadCode\Rector\ClassMethod;
66

77
use PhpParser\Node;
8-
use PhpParser\Node\Name\FullyQualified;
98
use PhpParser\Node\Stmt\Class_;
109
use PhpParser\Node\Stmt\ClassMethod;
1110
use PHPStan\PhpDocParser\Ast\PhpDoc\DeprecatedTagValueNode;

rules/Php81/Rector/FuncCall/NullToStrictIntPregSlitFuncCallLimitArgRector.php

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
namespace Rector\Php81\Rector\FuncCall;
66

77
use PhpParser\Node;
8-
use PhpParser\Node\Arg;
98
use PhpParser\Node\Expr\FuncCall;
10-
use PhpParser\Node\Identifier;
119
use PHPStan\Analyser\Scope;
1210
use PHPStan\Reflection\ClassReflection;
1311
use PHPStan\Reflection\FunctionReflection;
@@ -129,26 +127,6 @@ public function provideMinPhpVersion(): int
129127
return PhpVersionFeature::DEPRECATE_NULL_ARG_IN_STRING_FUNCTION;
130128
}
131129

132-
/**
133-
* @param Arg[] $args
134-
*/
135-
private function resolveNamedPosition(array $args): ?int
136-
{
137-
foreach ($args as $position => $arg) {
138-
if (! $arg->name instanceof Identifier) {
139-
continue;
140-
}
141-
142-
if (! $this->isName($arg->name, 'limit')) {
143-
continue;
144-
}
145-
146-
return $position;
147-
}
148-
149-
return null;
150-
}
151-
152130
private function shouldSkip(FuncCall $funcCall): bool
153131
{
154132
if (! $this->isName($funcCall, 'preg_split')) {

rules/Php85/Rector/Class_/SleepToSerializeRector.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace Rector\Php85\Rector\Class_;
66

7+
use PhpParser\Node\Scalar\String_;
8+
use PhpParser\Node\Expr\Variable;
79
use PhpParser\Node;
810
use PhpParser\Node\Expr\Array_;
911
use PhpParser\Node\Expr\ArrayItem;
@@ -28,8 +30,8 @@
2830
final class SleepToSerializeRector extends AbstractRector implements MinPhpVersionInterface
2931
{
3032
public function __construct(
31-
private BetterNodeFinder $betterNodeFinder,
32-
private ReturnAnalyzer $returnAnalyzer
33+
private readonly BetterNodeFinder $betterNodeFinder,
34+
private readonly ReturnAnalyzer $returnAnalyzer
3335
) {
3436
}
3537

@@ -110,18 +112,19 @@ public function refactor(Node $node): ?Node
110112
return null;
111113
}
112114

113-
if (count($return->expr->items) > 0) {
115+
if ($return->expr->items !== []) {
114116
$newItems = [];
115117
foreach ($return->expr->items as $item) {
116-
if ($item !== null && $item->value instanceof Node\Scalar\String_) {
118+
if ($item !== null && $item->value instanceof String_) {
117119
$propName = $item->value->value;
118120
$newItems[] = new ArrayItem(
119-
new PropertyFetch(new Node\Expr\Variable('this'), $propName),
121+
new PropertyFetch(new Variable('this'), $propName),
120122
$item->value
121123
);
122124
}
123125
}
124-
if (count($newItems) > 0) {
126+
127+
if ($newItems !== []) {
125128
$hasChanged = true;
126129
$return->expr->items = $newItems;
127130
}

src/NodeAnalyzer/ArgsAnalyzer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
use PhpParser\Node\Identifier;
99
use Rector\NodeNameResolver\NodeNameResolver;
1010

11-
final class ArgsAnalyzer
11+
final readonly class ArgsAnalyzer
1212
{
1313
public function __construct(
14-
private readonly NodeNameResolver $nodeNameResolver
14+
private NodeNameResolver $nodeNameResolver
1515
) {
1616
}
1717

0 commit comments

Comments
 (0)