Skip to content

Commit 1c7d8de

Browse files
authored
Prepare to Rector next 2.0 with PHPStan 2 and PHPParser 5 (#302)
* Prepare to Rector 2.0 with PHPStan 2 and PHPParser 5 * rector config * clean up upgrade process * Fix cs * try require php-parser 5 for phpunit conflict * bump to phpunit ^10.5.38 for latest phpunit 10 * try require preload * clean up composer.json * bump to rector 2
1 parent 8ae2a46 commit 1c7d8de

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
DEV_DEPENDENCIES = cakephp/cakephp:5.x-dev \
44
cakephp/cakephp-codesniffer:^5.0 \
55
mikey179/vfsstream:^1.6.8 \
6-
phpunit/phpunit:^10.1
6+
phpunit/phpunit:^10.5.38
77

88
install-dev:
99
composer require --dev $(DEV_DEPENDENCIES)

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"php": "^8.1",
99
"cakephp/console": "^5.0",
1010
"nette/utils": "^4.0",
11-
"rector/rector": "~1.2.0",
11+
"rector/rector": "~2.0.0",
1212
"symfony/string": "^6.0 || ^7.0"
1313
},
1414
"autoload": {

src/Rector/Rector/MethodCall/ArrayToFluentCallRector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ private function replaceArrayToFluentMethodCalls(
181181
}
182182

183183
/**
184-
* @param array<(\PhpParser\Node\Expr\ArrayItem|null)> $originalArrayItems
184+
* @param array<(\PhpParser\Node\ArrayItem | null)> $originalArrayItems
185185
* @param array<string, string> $arrayMap
186186
*/
187187
private function extractFluentMethods(array $originalArrayItems, array $arrayMap): ArrayItemsAndFluentClass

src/Rector/Rector/Namespace_/AppUsesStaticCallToUseStatementRector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use PhpParser\Node\Stmt\Declare_;
1212
use PhpParser\Node\Stmt\Namespace_;
1313
use PhpParser\Node\Stmt\Use_;
14-
use PhpParser\Node\Stmt\UseUse;
14+
use PhpParser\Node\UseItem;
1515
use PhpParser\NodeTraverser;
1616
use PHPStan\Type\ObjectType;
1717
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
@@ -82,7 +82,7 @@ public function refactor(Node $node): ?Node
8282
$names = $this->resolveNamesFromStaticCalls($appUsesStaticCalls);
8383
$uses = [];
8484
foreach ($names as $name) {
85-
$useUse = new UseUse(new Name($name));
85+
$useUse = new UseItem(new Name($name));
8686
$uses[] = new Use_([$useUse]);
8787
}
8888

src/Rector/Rector/Property/ChangeSnakedFixtureNameToPascalRector.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
use Cake\Utility\Inflector;
77
use PhpParser\Node;
8+
use PhpParser\Node\ArrayItem;
89
use PhpParser\Node\Expr\Array_;
9-
use PhpParser\Node\Expr\ArrayItem;
10+
use PhpParser\Node\PropertyItem;
1011
use PhpParser\Node\Scalar\String_;
1112
use PhpParser\Node\Stmt\Property;
12-
use PhpParser\Node\Stmt\PropertyProperty;
1313
use Rector\Rector\AbstractRector;
1414
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
1515
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -76,7 +76,7 @@ public function refactor(Node $node): ?Node
7676
return $node;
7777
}
7878

79-
private function refactorPropertyWithArrayDefault(PropertyProperty $propertyProperty): void
79+
private function refactorPropertyWithArrayDefault(PropertyItem $propertyProperty): void
8080
{
8181
if (! $propertyProperty->default instanceof Array_) {
8282
return;

src/Rector/ValueObject/ArrayItemsAndFluentClass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
final class ArrayItemsAndFluentClass
77
{
88
/**
9-
* @param array<\PhpParser\Node\Expr\ArrayItem> $arrayItems
9+
* @param array<\PhpParser\Node\ArrayItem> $arrayItems
1010
* @param array<string, \PhpParser\Node\Expr> $fluentCalls
1111
*/
1212
public function __construct(
@@ -16,7 +16,7 @@ public function __construct(
1616
}
1717

1818
/**
19-
* @return array<\PhpParser\Node\Expr\ArrayItem>
19+
* @return array<\PhpParser\Node\ArrayItem>
2020
*/
2121
public function getArrayItems(): array
2222
{

tests/bootstrap.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
error_reporting(-1);
1212
date_default_timezone_set('UTC');
1313

14+
require dirname(__DIR__) . '/vendor/rector/rector/preload.php';
15+
1416
require dirname(__DIR__) . '/vendor/autoload.php';
1517

1618
require dirname(__DIR__) . '/config/bootstrap.php';

0 commit comments

Comments
 (0)