andreaswolf · andreaswolf · May 20, 2025 · Dec 14, 2024 · May 20, 2025 · May 20, 2025
diff --git a/composer.json b/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"

diff --git a/...sts/AddPackageToRequireComposerJsonFractor/AddPackageToRequireComposerJsonFractorTest.php b/...sts/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';
     }

diff --git a/...dPackageToRequireDevComposerJsonFractor/AddPackageToRequireDevComposerJsonFractorTest.php b/...dPackageToRequireDevComposerJsonFractor/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';
     }

diff --git a/...s/ChangePackageVersionComposerJsonFractor/ChangePackageVersionComposerJsonFractorTest.php b/...s/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';
     }

diff --git a/...son/rules-tests/RemovePackageComposerJsonFractor/RemovePackageComposerJsonFractorTest.php b/...son/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';
     }

diff --git a/...son/rules-tests/RenamePackageComposerJsonFractor/RenamePackageComposerJsonFractorTest.php b/...son/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';
     }

diff --git a/...ePackageAndVersionComposerJsonFractor/ReplacePackageAndVersionComposerJsonFractorTest.php b/...ePackageAndVersionComposerJsonFractor/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';
     }

diff --git a/packages/fractor-fluid/tests/FluidFileProcessor/FluidFileProcessorTest.php b/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';
     }

diff --git a/packages/fractor-phpstan-rules/composer.json b/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,

diff --git a/packages/fractor-phpstan-rules/src/Rules/AddChangelogDocBlockForFractorRule.php b/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(),
+        ];
     }
 }
diff --git a/...tests/Rules/AddChangelogDocBlockForFractorRule/AddChangelogDocBlockForFractorRuleTest.php b/...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);

diff --git a/...lates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/__Name__Test.php.inc b/...lates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/__Name__Test.php.inc
@@ -20,7 +20,7 @@ final class __Name__Test extends AbstractFractorTestCase
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.__FixtureFileExtension__.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

diff --git a/packages/fractor-typoscript/src/Contract/TypoScriptNodeVisitor.php b/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;
 
@@ -25,7 +25,7 @@ public function enterNode(Statement $node): Statement|array|int;
     public function leaveNode(Statement $node): void;
 
     /**
-     * @param list<Statement> $statements
+     * @param Statement[] $statements
      */
     public function afterTraversal(array $statements): void;
 }
diff --git a/packages/fractor-typoscript/src/TypoScriptStatementsIterator.php b/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
     {

diff --git a/...EnforceEndTypoScriptConditionTermination/EnforceEndTypoScriptConditionTerminationTest.php b/...EnforceEndTypoScriptConditionTermination/EnforceEndTypoScriptConditionTerminationTest.php
@@ -20,7 +20,7 @@ public static function provideData(): \Iterator
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.typoscript.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

diff --git a/...eGlobalTypoScriptConditionTermination/EnforceGlobalTypoScriptConditionTerminationTest.php b/...eGlobalTypoScriptConditionTermination/EnforceGlobalTypoScriptConditionTerminationTest.php
@@ -20,7 +20,7 @@ public static function provideData(): \Iterator
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.typoscript.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

diff --git a/packages/fractor-typoscript/tests/Fixtures/DummyTypoScriptFractorRule.php b/packages/fractor-typoscript/tests/Fixtures/DummyTypoScriptFractorRule.php
@@ -13,7 +13,7 @@
 
 final class DummyTypoScriptFractorRule extends AbstractTypoScriptFractor
 {
-    public function refactor(Statement $statement): null|Statement|int
+    public function refactor(Statement $statement): null|int
     {
         if (! $statement instanceof Assignment) {
             return null;

diff --git a/packages/fractor-typoscript/tests/Fixtures/ReturnMultipleStatementsRule.php b/packages/fractor-typoscript/tests/Fixtures/ReturnMultipleStatementsRule.php
@@ -16,9 +16,9 @@
 final class ReturnMultipleStatementsRule extends AbstractTypoScriptFractor
 {
     /**
-     * @return null|Statement|int|list<Statement>
+     * @return null|list<Statement>
      */
-    public function refactor(Statement $statement): null|Statement|int|array
+    public function refactor(Statement $statement): null|array
     {
         if (! $statement instanceof Copy) {
             return null;

diff --git a/...cript/tests/KeepTypoScriptConditionTermination/KeepTypoScriptConditionTerminationTest.php b/...cript/tests/KeepTypoScriptConditionTermination/KeepTypoScriptConditionTerminationTest.php
@@ -20,7 +20,7 @@ public static function provideData(): \Iterator
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.typoscript.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

diff --git a/packages/fractor-typoscript/tests/TypoScriptFileProcessor/TypoScriptFileProcessorTest.php b/packages/fractor-typoscript/tests/TypoScriptFileProcessor/TypoScriptFileProcessorTest.php
@@ -34,7 +34,7 @@ public static function provideData(): \Iterator
         ];
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

diff --git a/packages/fractor-xml/src/XmlFileProcessor.php b/packages/fractor-xml/src/XmlFileProcessor.php
@@ -9,6 +9,7 @@
 use a9f\Fractor\Caching\Detector\ChangedFilesDetector;
 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;
@@ -35,6 +36,9 @@ public function canHandle(File $file): bool
         return $file->getFileExtension() === 'xml';
     }
 
+    /**
+     * @param list<DomNodeVisitor> $appliedRules
+     */
     public function handle(File $file, iterable $appliedRules): void
     {
         $fileHasChanged = \false;

diff --git a/packages/fractor-xml/tests/AbstractXmlFractorTest.php b/packages/fractor-xml/tests/AbstractXmlFractorTest.php
@@ -23,7 +23,7 @@ public function canHandle(\DOMNode $node): bool
                 return $node->nodeName === 'Child';
             }
 
-            public function refactor(\DOMNode $node): \DOMNode|int|null
+            public function refactor(\DOMNode $node): \DOMNode
             {
                 if ($node->ownerDocument === null) {
                     throw new \RuntimeException('Node does not have an ownerDocument, cannot create element');

diff --git a/packages/fractor-xml/tests/DomDocumentIteratorTest.php b/packages/fractor-xml/tests/DomDocumentIteratorTest.php
@@ -178,7 +178,7 @@ public function enterNode(\DOMNode $node): \DOMNode|int
     public function nodeIsReplacedIfVisitorReturnsNewDomNode(): void
     {
         $nodeRemovingVisitor = new class() extends CollectingDomNodeVisitor {
-            public function enterNode(\DOMNode $node): \DOMNode|int
+            public function enterNode(\DOMNode $node): \DOMNode
             {
                 parent::enterNode($node);
                 if ($node->nodeName === 'Child') {
@@ -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
     {
@@ -236,7 +236,7 @@ public function beforeTraversal(File $file, \DOMDocument $rootNode): void
                 $this->calls[] = sprintf('%s:beforeTraversal:%s', $this->visitorName, $rootNode->nodeName);
             }
 
-            public function enterNode(\DOMNode $node): \DOMNode|int
+            public function enterNode(\DOMNode $node): \DOMNode
             {
                 $this->calls[] = sprintf('%s:enterNode:%s', $this->visitorName, $node->nodeName);
                 return $node;

diff --git a/packages/fractor-yaml/tests/YamlFileProcessor/YamlFileProcessorTest.php b/packages/fractor-yaml/tests/YamlFileProcessor/YamlFileProcessorTest.php
@@ -23,7 +23,7 @@ public static function provideData(): Iterator
         return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.yaml.fixture');
     }
 
-    public function provideConfigFilePath(): ?string
+    public function provideConfigFilePath(): string
     {
         return __DIR__ . '/config/fractor.php';
     }

diff --git a/packages/fractor/src/Application/RuleSkipper.php b/packages/fractor/src/Application/RuleSkipper.php
@@ -28,7 +28,6 @@ public function shouldSkip(string $rule, string $filePath): bool
         }
 
         if (array_key_exists($rule, $configuredSkip)) {
-            /** @var string|list<string> $skippedPaths */
             $skippedPaths = $configuredSkip[$rule];
 
             if (is_string($skippedPaths)) {

diff --git a/packages/fractor/src/ChangesReporting/Output/ConsoleOutputFormatter.php b/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

diff --git a/packages/fractor/src/Configuration/AllowedFileExtensionsResolver.php b/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
     {

diff --git a/packages/fractor/src/Configuration/ConfigResolver.php b/packages/fractor/src/Configuration/ConfigResolver.php
@@ -8,7 +8,7 @@
 
 final class ConfigResolver
 {
-    public static function resolveConfigsFromInput(ArgvInput $input): ?string
+    public static function resolveConfigsFromInput(ArgvInput $input): string
     {
         return self::getOptionValue($input) ?? getcwd() . '/fractor.php';
     }

diff --git a/packages/fractor/src/Configuration/ConfigurationFactory.php b/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
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ public static function provideData(): \Iterator @@
             ];
         }
-        public function provideConfigFilePath(): ?string
+        public function provideConfigFilePath(): string
         {
             return __DIR__ . '/config/fractor.php';
         }
@@ Expand Down @@