Skip to content

Commit b7b1255

Browse files
TomasVotrubaTomasVotruba
committed
Updated Rector to commit 24977b28f1e491d771579700c1059d8a9c2075cc
rectorphp/rector-src@24977b2 [stmts-aware] Deprecate the interface and replace with meta-type + groups (#7679)
1 parent f338e5f commit b7b1255

File tree

83 files changed

+601
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+601
-325
lines changed

‎preload.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ function isPHPStanTestPreloaded(): bool
2626
}
2727

2828
require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/Node.php';
29+
// @todo to be deprecated
2930
require_once __DIR__ . '/src/Contract/PhpParser/Node/StmtsAwareInterface.php';
3031
require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/NodeAbstract.php';
3132
require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/Node/Expr.php';

‎rules/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector.php‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
use PhpParser\Node\Stmt\Expression;
1616
use PhpParser\Node\Stmt\Return_;
1717
use Rector\CodeQuality\NodeAnalyzer\VariableDimFetchAssignResolver;
18-
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
1918
use Rector\Exception\NotImplementedYetException;
19+
use Rector\PhpParser\Enum\NodeGroup;
2020
use Rector\Rector\AbstractRector;
2121
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
2222
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -61,14 +61,17 @@ function getPerson()
6161
*/
6262
public function getNodeTypes(): array
6363
{
64-
return [StmtsAwareInterface::class];
64+
return NodeGroup::STMTS_AWARE;
6565
}
6666
/**
67-
* @param StmtsAwareInterface $node
67+
* @param StmtsAware $node
6868
*/
6969
public function refactor(Node $node): ?Node
7070
{
71-
$stmts = (array) $node->stmts;
71+
if ($node->stmts === null) {
72+
return null;
73+
}
74+
$stmts = $node->stmts;
7275
// skip primitive cases, as may be on purpose
7376
if (count($stmts) < 3) {
7477
return null;
@@ -169,7 +172,7 @@ private function areAssignExclusiveToDimFetchVariable(array $stmts, ?Assign $emp
169172
return \true;
170173
}
171174
/**
172-
* @param Expression[] $stmts
175+
* @param Stmt[] $stmts
173176
*/
174177
private function resolveDefaultEmptyArrayAssign(array $stmts, string $returnedVariableName): ?Assign
175178
{

‎rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
use PhpParser\Node\Stmt\Foreach_;
1515
use PhpParser\NodeVisitor;
1616
use Rector\CodeQuality\NodeAnalyzer\ForeachAnalyzer;
17-
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
1817
use Rector\NodeAnalyzer\ExprAnalyzer;
18+
use Rector\PhpParser\Enum\NodeGroup;
1919
use Rector\PhpParser\Node\Value\ValueResolver;
2020
use Rector\Rector\AbstractRector;
2121
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -76,10 +76,10 @@ public function run($items)
7676
*/
7777
public function getNodeTypes(): array
7878
{
79-
return [StmtsAwareInterface::class];
79+
return NodeGroup::STMTS_AWARE;
8080
}
8181
/**
82-
* @param StmtsAwareInterface $node
82+
* @param StmtsAware $node
8383
*/
8484
public function refactor(Node $node): ?Node
8585
{

‎rules/CodeQuality/Rector/Foreach_/ForeachToInArrayRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
use PhpParser\Node\Stmt\If_;
1515
use PhpParser\Node\Stmt\Return_;
1616
use PhpParser\NodeFinder;
17-
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
1817
use Rector\NodeManipulator\BinaryOpManipulator;
1918
use Rector\Php71\ValueObject\TwoNodeMatch;
19+
use Rector\PhpParser\Enum\NodeGroup;
2020
use Rector\PhpParser\Node\Value\ValueResolver;
2121
use Rector\Rector\AbstractRector;
2222
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -65,10 +65,10 @@ public function getRuleDefinition(): RuleDefinition
6565
*/
6666
public function getNodeTypes(): array
6767
{
68-
return [StmtsAwareInterface::class];
68+
return NodeGroup::STMTS_AWARE;
6969
}
7070
/**
71-
* @param StmtsAwareInterface $node
71+
* @param StmtsAware $node
7272
*/
7373
public function refactor(Node $node): ?Node
7474
{

‎rules/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use PhpParser\Node\Stmt\Foreach_;
1616
use PhpParser\Node\Stmt\If_;
1717
use PhpParser\Node\Stmt\Return_;
18-
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
18+
use Rector\PhpParser\Enum\NodeGroup;
1919
use Rector\Rector\AbstractRector;
2020
use Rector\ValueObject\PhpVersionFeature;
2121
use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@@ -47,10 +47,10 @@ public function getRuleDefinition(): RuleDefinition
4747
*/
4848
public function getNodeTypes(): array
4949
{
50-
return [StmtsAwareInterface::class];
50+
return NodeGroup::STMTS_AWARE;
5151
}
5252
/**
53-
* @param StmtsAwareInterface $node
53+
* @param StmtsAware $node
5454
*/
5555
public function refactor(Node $node): ?Node
5656
{

‎rules/CodeQuality/Rector/Foreach_/UnusedForeachValueToArrayKeysRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use PhpParser\Node\Expr\List_;
1010
use PhpParser\Node\Expr\Variable;
1111
use PhpParser\Node\Stmt\Foreach_;
12-
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
1312
use Rector\DeadCode\NodeAnalyzer\ExprUsedInNodeAnalyzer;
1413
use Rector\NodeManipulator\StmtsManipulator;
14+
use Rector\PhpParser\Enum\NodeGroup;
1515
use Rector\PhpParser\Node\BetterNodeFinder;
1616
use Rector\Rector\AbstractRector;
1717
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -72,10 +72,10 @@ public function run()
7272
*/
7373
public function getNodeTypes(): array
7474
{
75-
return [StmtsAwareInterface::class];
75+
return NodeGroup::STMTS_AWARE;
7676
}
7777
/**
78-
* @param StmtsAwareInterface $node
78+
* @param StmtsAware $node
7979
*/
8080
public function refactor(Node $node): ?Node
8181
{

‎rules/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
use PhpParser\Node\Stmt\Return_;
1515
use PHPStan\Type\MixedType;
1616
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
17-
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
1817
use Rector\Contract\Rector\ConfigurableRectorInterface;
1918
use Rector\NodeAnalyzer\CallAnalyzer;
2019
use Rector\NodeAnalyzer\VariableAnalyzer;
2120
use Rector\NodeTypeResolver\Node\AttributeKey;
21+
use Rector\PhpParser\Enum\NodeGroup;
2222
use Rector\PhpParser\Node\AssignAndBinaryMap;
2323
use Rector\Rector\AbstractRector;
2424
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
@@ -104,10 +104,10 @@ function () {
104104
*/
105105
public function getNodeTypes(): array
106106
{
107-
return [StmtsAwareInterface::class];
107+
return NodeGroup::STMTS_AWARE;
108108
}
109109
/**
110-
* @param StmtsAwareInterface $node
110+
* @param StmtsAware $node
111111
*/
112112
public function refactor(Node $node): ?Node
113113
{
@@ -140,9 +140,11 @@ public function refactor(Node $node): ?Node
140140
return null;
141141
}
142142
/**
143+
* @param StmtsAware $stmtsAware
144+
* @return StmtsAware|null
143145
* @param \PhpParser\Node\Expr\Assign|\PhpParser\Node\Expr\AssignOp $assign
144146
*/
145-
private function processSimplifyUselessVariable(StmtsAwareInterface $stmtsAware, Return_ $return, $assign, int $key): ?StmtsAwareInterface
147+
private function processSimplifyUselessVariable(Node $stmtsAware, Return_ $return, $assign, int $key): ?Node
146148
{
147149
if (!$assign instanceof Assign) {
148150
$binaryClass = $this->assignAndBinaryMap->getAlternative($assign);

‎rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
use PhpParser\Node\Stmt\Expression;
1212
use PhpParser\Node\Stmt\If_;
1313
use PhpParser\Node\Stmt\Return_;
14-
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
1514
use Rector\NodeManipulator\IfManipulator;
15+
use Rector\PhpParser\Enum\NodeGroup;
1616
use Rector\PhpParser\Node\Value\ValueResolver;
1717
use Rector\Rector\AbstractRector;
1818
use Rector\ValueObject\PhpVersionFeature;
@@ -72,10 +72,10 @@ public function run()
7272
*/
7373
public function getNodeTypes(): array
7474
{
75-
return [StmtsAwareInterface::class];
75+
return NodeGroup::STMTS_AWARE;
7676
}
7777
/**
78-
* @param StmtsAwareInterface $node
78+
* @param StmtsAware $node
7979
*/
8080
public function refactor(Node $node): ?Node
8181
{

‎rules/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
use PhpParser\Node\Stmt\Else_;
99
use PhpParser\Node\Stmt\If_;
1010
use PhpParser\Node\Stmt\Return_;
11-
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
1211
use Rector\NodeManipulator\IfManipulator;
12+
use Rector\PhpParser\Enum\NodeGroup;
1313
use Rector\PhpParser\Node\Value\ValueResolver;
1414
use Rector\Rector\AbstractRector;
1515
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -53,12 +53,13 @@ public function getRuleDefinition(): RuleDefinition
5353
*/
5454
public function getNodeTypes(): array
5555
{
56-
return [StmtsAwareInterface::class];
56+
return NodeGroup::STMTS_AWARE;
5757
}
5858
/**
59-
* @param StmtsAwareInterface $node
59+
* @param StmtsAware $node
60+
* @return StmtsAware
6061
*/
61-
public function refactor(Node $node): ?StmtsAwareInterface
62+
public function refactor(Node $node): ?Node
6263
{
6364
foreach ((array) $node->stmts as $key => $stmt) {
6465
if (!$stmt instanceof If_) {

‎rules/CodeQuality/Rector/If_/SimplifyIfNullableReturnRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
use PHPStan\Type\Type;
1818
use PHPStan\Type\UnionType;
1919
use Rector\CodeQuality\TypeResolver\AssignVariableTypeResolver;
20-
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
2120
use Rector\DeadCode\PhpDoc\TagRemover\VarTagRemover;
2221
use Rector\NodeManipulator\IfManipulator;
22+
use Rector\PhpParser\Enum\NodeGroup;
2323
use Rector\PhpParser\Node\Value\ValueResolver;
2424
use Rector\Rector\AbstractRector;
2525
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
@@ -91,10 +91,10 @@ public function get(): ?stdClass {
9191
*/
9292
public function getNodeTypes(): array
9393
{
94-
return [StmtsAwareInterface::class];
94+
return NodeGroup::STMTS_AWARE;
9595
}
9696
/**
97-
* @param StmtsAwareInterface $node
97+
* @param StmtsAware $node
9898
*/
9999
public function refactor(Node $node): ?Node
100100
{

0 commit comments

Comments
 (0)