Rector 2.0 (#277)

* PHPStan & Rector 2.0 support (#271)

* Update rector dependency to 2.0.0-rc1 (#273)

* Update rector to 2.0.0.rc2

* Simplify composer scripts

* Fix downgrade scripts

* Add MigrateToSimplifiedAttributeRector to Laravel 9 set (#275)

* Update Duster and use latest Pint configuration (#276)

* Update Duster

* Remove pint.json and run Duster

* Refactor into our own AbstractRector that implements DocumentedRuleInterface

* Update to Rector 2.0

---------

Co-authored-by: Michael Wikberg <[email protected]>
Co-authored-by: Abdul Malik Ikhsan <[email protected]>
Co-authored-by: M ɑ k s <[email protected]>

Author: 4 people

.github/workflows/downgraded_release.yaml

@@ -15,12 +15,12 @@ jobs:
 
         steps:
             -
-                uses: "actions/checkout@v3"
+                uses: "actions/checkout@v4"
 
             -
                 uses: "shivammathur/setup-php@v2"
                 with:
-                    php-version: 8.2
+                    php-version: 8.3
                     coverage: none
 
             -   uses: "ramsey/composer-install@v2"

build/composer-php-72.json

@@ -5,7 +5,7 @@
     "description": "Rector upgrades rules for Laravel Framework",
     "require": {
         "php": "^7.2 || ^8.0",
-        "rector/rector": "^1.0"
+        "rector/rector": "^2.0"
     },
     "autoload": {
         "psr-4": {

build/rector-downgrade-php-72.php

@@ -3,8 +3,5 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\Set\ValueObject\DowngradeLevelSetList;
 
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->sets([DowngradeLevelSetList::DOWN_TO_PHP_72]);
-};
+return RectorConfig::configure()->withDowngradeSets(php72: true);

composer.json

@@ -5,19 +5,20 @@
     "description": "Rector upgrades rules for Laravel Framework",
     "require": {
         "php": ">=8.2",
-        "rector/rector": "^1.2.5"
+        "rector/rector": "^2.0.0",
+        "webmozart/assert": "^1.11",
+        "symplify/rule-doc-generator-contracts": "^11.2"
     },
     "require-dev": {
-        "nikic/php-parser": "^4.18",
+        "nikic/php-parser": "^5.3",
         "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-strict-rules": "^1.5",
-        "phpstan/phpstan-webmozart-assert": "^1.2",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-strict-rules": "^2.0",
+        "phpstan/phpstan-webmozart-assert": "^2.0",
         "phpunit/phpunit": "^10.5",
-        "symplify/phpstan-extensions": "^11.4",
-        "symplify/phpstan-rules": "^12.4",
-        "symplify/rule-doc-generator": "^12.1",
-        "tightenco/duster": "^2.7"
+        "symplify/rule-doc-generator": "^12.2",
+        "tightenco/duster": "^3.1"
     },
     "autoload": {
         "psr-4": {
@@ -31,9 +32,7 @@
         "classmap": ["stubs"]
     },
     "scripts": {
-        "phpstan": "vendor/bin/phpstan analyse --ansi --error-format symplify",
-        "check-cs": "vendor/bin/duster lint",
-        "fix-cs": "vendor/bin/duster fix",
+        "phpstan": "vendor/bin/phpstan analyse --ansi",
         "lint": "vendor/bin/duster lint",
         "fix": "vendor/bin/duster fix",
         "rector-dry-run": "vendor/bin/rector process --dry-run --ansi",

config/config.php

@@ -4,5 +4,4 @@
 
 use Rector\Config\RectorConfig;
 
-return static function (RectorConfig $rectorConfig): void {
-};
+return static function (RectorConfig $rectorConfig): void {};

config/sets/laravel90.php

@@ -12,6 +12,7 @@
 use Rector\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector;
 use Rector\Visibility\ValueObject\ChangeMethodVisibility;
 use RectorLaravel\Rector\Class_\AddExtendsAnnotationToModelFactoriesRector;
+use RectorLaravel\Rector\ClassMethod\MigrateToSimplifiedAttributeRector;
 use RectorLaravel\Rector\PropertyFetch\ReplaceFakerInstanceWithHelperRector;
 
 // see https://laravel.com/docs/9.x/upgrade
@@ -106,4 +107,7 @@
             // https://github.com/laravel/framework/commit/9894c2c64dc70f7dfda2ac46dfdaa8769ce4596a
             new MethodCallRename('Illuminate\Testing\TestResponse', 'assertDeleted', 'assertModelMissing'),
         ]);
+
+    // https://github.com/laravel/framework/commit/e0c2620b57be6416820ea7ca8e46fd2f71d2fe35
+    $rectorConfig->rule(MigrateToSimplifiedAttributeRector::class);
 };

phpstan.neon

@@ -1,5 +1,3 @@
-includes:
-    - vendor/symplify/phpstan-rules/config/rector-rules.neon
 parameters:
     level: max
 
@@ -15,7 +13,7 @@ parameters:
         - */Source/*
         - *Source/*
 
-#    reportUnmatchedIgnoredErrors: false
+    treatPhpDocTypesAsCertain: false
 
     ignoreErrors:
         # false positive
@@ -32,3 +30,7 @@ parameters:
 
         # Laravel Container not being recognized properly in some of the tests
         - '#Call to method needs\(\) on an unknown class Illuminate\\Contracts\\Container\\ContextualBindingBuilder#'
+        - '#Cannot call method give\(\) on mixed.#'
+
+        # No easy replacement for this check, it's also ignored in core Rector
+        - '#Doing instanceof PHPStan\\Type\\Generic\\GenericObjectType is error\-prone and deprecated#'

pint.json

@@ -0,0 +1,8 @@
+<?php
+
+namespace RectorLaravel;
+
+use Rector\Rector\AbstractRector as BaseAbstractRector;
+use Symplify\RuleDocGenerator\Contract\DocumentedRuleInterface;
+
+abstract class AbstractRector extends BaseAbstractRector implements DocumentedRuleInterface {}

src/AbstractRector.php

@@ -16,8 +16,7 @@
     public function __construct(
         private NodeTypeResolver $nodeTypeResolver,
         private NodeNameResolver $nodeNameResolver
-    ) {
-    }
+    ) {}
 
     public function isLumenRoutingClass(MethodCall $methodCall): bool
     {