Merge pull request #260 from andreaswolf/rector-2

[TASK] Use Rector 2.0

Author: andreaswolf

composer.json

@@ -21,7 +21,7 @@
         "league/flysystem-memory": "^2.0 || ^3.0",
         "nette/utils": "^4.0",
         "ondram/ci-detector": "^4.2",
-        "phpstan/phpstan": "^1.10.9",
+        "phpstan/phpstan": "^2.0.0",
         "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
         "simonschaufi/pretty-xml": "^3.0.0",
         "symfony/config": "^5.4 || ^6.4 || ^7.0",
@@ -36,9 +36,9 @@
     "require-dev": {
         "composer/composer": "^2.7",
         "ergebnis/composer-normalize": "^2.42",
-        "phpstan/phpstan-phpunit": "^1.3",
+        "phpstan/phpstan-phpunit": "^2.0.0",
         "phpunit/phpunit": "^10.5",
-        "rector/rector": "^1.2.6",
+        "rector/rector": "^2.0.0",
         "symplify/easy-coding-standard": "^12.3",
         "symplify/monorepo-builder": "^11.2",
         "symplify/rule-doc-generator": "12.1.3"

packages/fractor-composer-json/rules-tests/AddPackageToRequireComposerJsonFractor/AddPackageToRequireComposerJsonFractorTest.php

@@ -23,7 +23,7 @@ public static function provideData(): Iterator
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

packages/fractor-composer-json/rules-tests/AddPackageToRequireDevComposerJsonFractor/AddPackageToRequireDevComposerJsonFractorTest.php

@@ -23,7 +23,7 @@ public static function provideData(): Iterator
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

packages/fractor-composer-json/rules-tests/ChangePackageVersionComposerJsonFractor/ChangePackageVersionComposerJsonFractorTest.php

@@ -23,7 +23,7 @@ public static function provideData(): Iterator
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

packages/fractor-composer-json/rules-tests/RemovePackageComposerJsonFractor/RemovePackageComposerJsonFractorTest.php

@@ -23,7 +23,7 @@ public static function provideData(): Iterator
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

packages/fractor-composer-json/rules-tests/RenamePackageComposerJsonFractor/RenamePackageComposerJsonFractorTest.php

@@ -23,7 +23,7 @@ public static function provideData(): Iterator
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

packages/fractor-composer-json/rules-tests/ReplacePackageAndVersionComposerJsonFractor/ReplacePackageAndVersionComposerJsonFractorTest.php

@@ -23,7 +23,7 @@ public static function provideData(): Iterator
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

packages/fractor-fluid/tests/FluidFileProcessor/FluidFileProcessorTest.php

@@ -23,7 +23,7 @@ public static function provideData(): Iterator
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.html.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

packages/fractor-phpstan-rules/composer.json

@@ -16,7 +16,7 @@
     "require": {
         "php": "^8.2",
         "a9f/fractor": "^0.5",
-        "phpstan/phpstan": "^1.10.9"
+        "phpstan/phpstan": "^2.0.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

packages/fractor-phpstan-rules/src/Rules/AddChangelogDocBlockForFractorRule.php

@@ -13,6 +13,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\FileTypeMapper;
 
 /**
@@ -72,7 +73,11 @@ public function processNode(Node $node, Scope $scope): array
 
         $docComment = $node->getDocComment();
         if (! $docComment instanceof Doc) {
-            return [sprintf(self::ERROR_MESSAGE, $className)];
+            return [
+                RuleErrorBuilder::message(sprintf(self::ERROR_MESSAGE, $className))
+                    ->identifier('change.docblock')
+                    ->build(),
+            ];
         }
 
         $resolvedPhpDoc = $this->fileTypeMapper->getResolvedPhpDoc(
@@ -88,6 +93,10 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
 
-        return [sprintf(self::ERROR_MESSAGE, $className)];
+        return [
+            RuleErrorBuilder::message(sprintf(self::ERROR_MESSAGE, $className))
+                ->identifier('change.docblock')
+                ->build(),
+        ];
     }
 }