[TASK] Use Rector 2.0

Author: simonschaufi

composer.json

@@ -18,7 +18,7 @@
         "eta-orionis/composer-json-manipulator": "^1.0.1",
         "helmich/typo3-typoscript-parser": "^2.6",
         "nette/utils": "^4.0",
-        "phpstan/phpstan": "^1.10.9",
+        "phpstan/phpstan": "^1.10.9 || ^2.0.0",
         "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
         "shanethehat/pretty-xml": "^1.0.2",
         "symfony/config": "^5.4 || ^6.4 || ^7.0",
@@ -33,9 +33,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-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(),
+        ];
     }
 }

packages/fractor-phpstan-rules/tests/Rules/AddChangelogDocBlockForFractorRule/AddChangelogDocBlockForFractorRuleTest.php

@@ -16,9 +16,9 @@
 final class AddChangelogDocBlockForFractorRuleTest extends RuleTestCase
 {
     /**
-     * @param array<int, mixed> $expectedErrorsWithLines
+     * @param list<array{0: string, 1: int, 2?: string|null}> $expectedErrorsWithLines
      */
-    #[DataProvider(methodName: 'provideData')]
+    #[DataProvider('provideData')]
     public function testRule(string $filePath, array $expectedErrorsWithLines): void
     {
         $this->analyse([$filePath], $expectedErrorsWithLines);

packages/fractor-typoscript/src/Contract/TypoScriptNodeVisitor.php

@@ -13,7 +13,7 @@
 interface TypoScriptNodeVisitor
 {
     /**
-     * @param list<Statement> $statements
+     * @param Statement[] $statements
      */
     public function beforeTraversal(File $file, array $statements): void;
 
@@ -22,7 +22,7 @@ public function enterNode(Statement $node): Statement|int;
     public function leaveNode(Statement $node): void;
 
     /**
-     * @param list<Statement> $statements
+     * @param Statement[] $statements
      */
     public function afterTraversal(array $statements): void;
 }

packages/fractor-typoscript/src/TypoScriptStatementsIterator.php

@@ -19,12 +19,12 @@
     public const REMOVE_NODE = 3;
 
     /**
-     * @var array<TypoScriptNodeVisitor>
+     * @var TypoScriptNodeVisitor[]
      */
     private iterable $visitors;
 
     /**
-     * @param list<TypoScriptNodeVisitor> $visitors
+     * @param TypoScriptNodeVisitor[] $visitors
      */
     public function __construct(iterable $visitors)
     {
@@ -34,8 +34,8 @@ public function __construct(iterable $visitors)
     }
 
     /**
-     * @param list<Statement> $statements
-     * @return list<Statement>
+     * @param Statement[] $statements
+     * @return Statement[]
      */
     public function traverseDocument(File $file, array $statements): array
     {
@@ -53,8 +53,8 @@ public function traverseDocument(File $file, array $statements): array
     }
 
     /**
-     * @param list<Statement> $statements
-     * @return list<Statement>
+     * @param Statement[] $statements
+     * @return Statement[]
      */
     private function processStatementList(array $statements): array
     {

packages/fractor-xml/src/XmlFileProcessor.php

@@ -8,6 +8,7 @@
 use a9f\Fractor\Application\ValueObject\File;
 use a9f\Fractor\Exception\ShouldNotHappenException;
 use a9f\Fractor\ValueObject\Indent;
+use a9f\FractorXml\Contract\DomNodeVisitor;
 use a9f\FractorXml\Contract\Formatter;
 use a9f\FractorXml\Contract\XmlFractor;
 use a9f\FractorXml\ValueObjectFactory\DomDocumentFactory;
@@ -33,6 +34,9 @@ public function canHandle(File $file): bool
         return $file->getFileExtension() === 'xml';
     }
 
+    /**
+     * @param list<DomNodeVisitor> $appliedRules
+     */
     public function handle(File $file, iterable $appliedRules): void
     {
         $document = $this->domDocumentFactory->create();

packages/fractor-xml/tests/DomDocumentIteratorTest.php

@@ -217,7 +217,7 @@ private function getCollectingDomNodeVisitor(): CollectingDomNodeVisitor
     }
 
     /**
-     * @param list<string> $recorder
+     * @param list<non-empty-string> $recorder
      */
     private function getCallRecordingDomNodeVisitor(string $visitorName, array &$recorder): DomNodeVisitor
     {

packages/fractor/src/ChangesReporting/Output/ConsoleOutputFormatter.php

@@ -17,9 +17,6 @@ class ConsoleOutputFormatter implements OutputFormatterInterface
      */
     public const NAME = 'console';
 
-    /**
-     * @readonly
-     */
     private SymfonyStyle $symfonyStyle;
 
     public function setSymfonyStyle(SymfonyStyle $symfonyStyle): void

packages/fractor/src/Configuration/AllowedFileExtensionsResolver.php

@@ -20,7 +20,7 @@ public function __construct(
     }
 
     /**
-     * @return list<non-empty-string>
+     * @return array<int<0, max>, non-empty-string>
      */
     public function resolve(): array
     {

packages/fractor/src/Configuration/ConfigurationFactory.php

@@ -19,9 +19,12 @@ public function __construct(
 
     public function createFromInput(InputInterface $input): Configuration
     {
+        /** @var list<non-empty-string> $paths */
+        $paths = (array) $this->parameterBag->get(Option::PATHS);
+
         return new Configuration(
             $this->allowedFileExtensionsResolver->resolve(),
-            (array) $this->parameterBag->get(Option::PATHS),
+            $paths,
             (array) $this->parameterBag->get(Option::SKIP),
             (bool) $input->getOption(Option::DRY_RUN),
             (bool) $input->getOption(Option::QUIET)
@@ -30,7 +33,7 @@ public function createFromInput(InputInterface $input): Configuration
 
     /**
      * @api used in tests
-     * @param string[] $paths
+     * @param list<non-empty-string> $paths
      */
     public function createForTests(array $paths): Configuration
     {

packages/fractor/src/Testing/PHPUnit/AbstractFractorTestCase.php

@@ -139,6 +139,9 @@ private function bootContainer(): void
         );
     }
 
+    /**
+     * @param non-empty-string $originalFilePath
+     */
     private function doTestFileMatchesExpectedContent(
         string $originalFilePath,
         string $expectedFileContents,
@@ -162,6 +165,9 @@ private function doTestFileMatchesExpectedContent(
         self::assertSame(trim($expectedFileContents), trim($changedContents), $failureMessage);
     }
 
+    /**
+     * @param non-empty-string $filePath
+     */
     private function processFilePath(string $filePath): FractorTestResult
     {
         $configurationFactory = $this->getService(ConfigurationFactory::class);
@@ -175,6 +181,9 @@ private function processFilePath(string $filePath): FractorTestResult
         return new FractorTestResult($changedFileContents, $processResult);
     }
 
+    /**
+     * @return non-empty-string
+     */
     private function createInputFilePath(string $fixtureFilePath): string
     {
         $inputFileDirectory = \dirname($fixtureFilePath);

phpstan.neon

@@ -16,3 +16,7 @@ parameters:
         - packages/**/tests/**/Fixture/*
         - packages/**/tests/Fixtures/*
         - packages/fractor-rule-generator/templates
+    treatPhpDocTypesAsCertain: false
+    ignoreErrors:
+        - identifier: return.unusedType
+        - identifier: varTag.nativeType