andreaswolf · sabbelasichon · Apr 20, 2024 · Apr 20, 2024 · Apr 20, 2024 · Apr 20, 2024
diff --git a/.build/rector.php b/.build/rector.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPhpSets(php82: true)
+    ->withPreparedSets(deadCode: true, typeDeclarations: true, earlyReturn: true, strictBooleans: true)
+    ->withImportNames(true, true, false, true);
diff --git a/.github/workflows/lint_test_pull_requests.yaml b/.github/workflows/lint_test_pull_requests.yaml
@@ -19,6 +19,8 @@ jobs:
             command: analyze:php
           - name: PHPUnit
             command: test:php
+          - name: Rector
+            command: 'rector --dry-run'
         directory: ['extension-installer', 'fractor', 'fractor-xml', 'typo3-fractor']
         exclude:
           - directory: extension-installer

diff --git a/extension-installer/composer.json b/extension-installer/composer.json
@@ -18,6 +18,7 @@
     "composer/composer": "^2.7",
     "ergebnis/composer-normalize": "^2.42",
     "phpstan/phpstan": "^1.10",
+    "rector/rector": "^1.0",
     "symplify/easy-coding-standard": "^12.1"
   },
   "autoload": {
@@ -36,6 +37,7 @@
   },
   "scripts": {
     "analyze:php": "phpstan analyze",
+    "rector": "rector",
     "style:php:check": "ecs",
     "style:php:fix": "ecs --fix"
   }

diff --git a/extension-installer/rector.php b/extension-installer/rector.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+return (include __DIR__ . '/../.build/rector.php')
+    ->withPaths([
+        __DIR__ . '/src',
+    ]);
diff --git a/fractor-xml/composer.json b/fractor-xml/composer.json
@@ -22,6 +22,7 @@
         "ergebnis/composer-normalize": "^2.42",
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^10.5",
+        "rector/rector": "^1.0",
         "symplify/easy-coding-standard": "^12.1"
     },
     "repositories": {
@@ -49,6 +50,7 @@
     },
     "scripts": {
         "analyze:php": "phpstan analyze",
+        "rector": "rector",
         "style:php:check": "ecs",
         "style:php:fix": "ecs --fix",
         "test:php": "phpunit"

diff --git a/fractor-xml/rector.php b/fractor-xml/rector.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+return (include __DIR__ . '/../.build/rector.php')
+    ->withPaths([
+        __DIR__ . '/config',
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ]);
diff --git a/fractor-xml/src/DomDocumentIterator.php b/fractor-xml/src/DomDocumentIterator.php
@@ -6,15 +6,15 @@
 use a9f\FractorXml\Exception\ShouldNotHappenException;
 use Webmozart\Assert\Assert;
 
-final class DomDocumentIterator
+final readonly class DomDocumentIterator
 {
     /** @var int */
     public const REMOVE_NODE = 3;
 
     /**
      * @param list<DomNodeVisitor> $visitors
      */
-    public function __construct(private readonly iterable $visitors)
+    public function __construct(private iterable $visitors)
     {
         Assert::allIsInstanceOf($this->visitors, DomNodeVisitor::class);
     }

diff --git a/fractor/composer.json b/fractor/composer.json
@@ -26,6 +26,7 @@
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpunit/phpunit": "^10.5",
+        "rector/rector": "^1.0",
         "symplify/easy-coding-standard": "^12.1"
     },
     "autoload": {
@@ -49,6 +50,7 @@
     },
     "scripts": {
         "analyze:php": "phpstan analyze",
+        "rector": "rector",
         "style:php:check": "ecs",
         "style:php:fix": "ecs --fix",
         "test:php": "phpunit"

diff --git a/fractor/rector.php b/fractor/rector.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+return (include __DIR__ . '/../.build/rector.php')
+    ->withPaths([
+        __DIR__ . '/config',
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ]);
diff --git a/fractor/src/Differ/Formatter/ColorConsoleDiffFormatter.php b/fractor/src/Differ/Formatter/ColorConsoleDiffFormatter.php
@@ -7,7 +7,7 @@
 use Nette\Utils\Strings;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 
-final class ColorConsoleDiffFormatter
+final readonly class ColorConsoleDiffFormatter
 {
     /**
      * @var string
@@ -33,7 +33,7 @@ final class ColorConsoleDiffFormatter
      */
     private const NEWLINES_REGEX = "#\n\r|\n#";
 
-    private readonly string $template;
+    private string $template;
 
     public function __construct()
     {

diff --git a/fractor/src/Skipper/FileSystem/FilePathHelper.php b/fractor/src/Skipper/FileSystem/FilePathHelper.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Filesystem\Filesystem;
 use Webmozart\Assert\Assert;
 
-final class FilePathHelper
+final readonly class FilePathHelper
 {
     /**
      * @see https://regex101.com/r/d4F5Fm/1
@@ -27,7 +27,7 @@ final class FilePathHelper
      */
     private const SCHEME_UNDEFINED = 'undefined';
 
-    public function __construct(private readonly Filesystem $filesystem)
+    public function __construct(private Filesystem $filesystem)
     {
     }
 

diff --git a/typo3-fractor/composer.json b/typo3-fractor/composer.json
@@ -21,6 +21,7 @@
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpunit/phpunit": "^10.5",
+        "rector/rector": "^1.0",
         "symplify/easy-coding-standard": "^12.1"
     },
     "repositories": {
@@ -48,6 +49,7 @@
     },
     "scripts": {
         "analyze:php": "phpstan analyze",
+        "rector": "rector",
         "style:php:check": "ecs",
         "style:php:fix": "ecs --fix",
         "test:php": "phpunit"

diff --git a/typo3-fractor/rector.php b/typo3-fractor/rector.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+return (include __DIR__ . '/../.build/rector.php')
+    ->withPaths([
+        __DIR__ . '/config',
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ]);