Merge pull request #485 from wayofdev/feat/tpl-updates

Author: lotyp

.github/workflows/integrate.yml

@@ -361,9 +361,6 @@ jobs:
         with:
           dependencies: ${{ matrix.dependencies }}
 
-      - name: 🐛 Check installed packages for security vulnerability advisories
-        run: composer audit --ansi
-
       - name: 🔍 Run static analysis using phpstan
         run: composer stan:ci
 
@@ -425,4 +422,55 @@ jobs:
       - name: 🧪 Run tests using phpunit/phpunit
         run: php vendor/bin/pest
 
+  refactoring:
+    timeout-minutes: 4
+    runs-on: ${{ matrix.os }}
+    concurrency:
+      cancel-in-progress: true
+      group: refactoring-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os:
+          - ubuntu-latest
+        php-version:
+          - '8.2'
+        dependencies:
+          - locked
+    steps:
+      - name: 📦 Check out the codebase
+        uses: actions/[email protected]
+
+      - name: 🛠️ Setup PHP
+        uses: shivammathur/[email protected]
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: mbstring, pdo, pdo_sqlite
+          ini-values: error_reporting=E_ALL
+          coverage: none
+
+      - name: 🛠️ Setup problem matchers
+        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+      - name: 🤖 Validate composer.json and composer.lock
+        run: composer validate --ansi --strict
+
+      - name: 🔍 Get composer cache directory
+        uses: wayofdev/gh-actions/actions/composer/get-cache-directory@master
+
+      - name: ♻️ Restore cached dependencies installed with composer
+        uses: actions/[email protected]
+        with:
+          path: ${{ env.COMPOSER_CACHE_DIR }}
+          key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}
+          restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
+
+      - name: 📥 Install "${{ matrix.dependencies }}" dependencies
+        uses: wayofdev/gh-actions/actions/composer/install@master
+        with:
+          dependencies: ${{ matrix.dependencies }}
+
+      - name: ⚙️ Run automated refactoring with rector/rector
+        run: composer refactor:ci
+
 ...

Makefile

@@ -209,6 +209,10 @@ lint-audit: ## Runs security checks for composer dependencies
 	$(APP_COMPOSER) audit
 .PHONY: lint-security
 
+refactor: ## Runs rector – code refactoring tool
+	$(APP_COMPOSER) refactor
+.PHONY: refactor
+
 #
 # Testing
 # ------------------------------------------------------------------------------------

composer.json

@@ -35,6 +35,7 @@
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "^10.5 || ^11.0",
+        "rector/rector": "^1.0",
         "roave/security-advisories": "dev-latest",
         "wayofdev/cs-fixer-config": "^1.2"
     },
@@ -88,6 +89,8 @@
         "stan:ci": "php vendor/bin/phpstan analyse --memory-limit=2G --error-format=github",
         "stan:baseline": "php vendor/bin/phpstan analyse --generate-baseline --memory-limit=2G --allow-empty-baseline",
         "test": "XDEBUG_MODE=coverage php vendor/bin/pest",
-        "test:cc": "XDEBUG_MODE=coverage php vendor/bin/pest --coverage --coverage-clover=.build/phpunit/logs/clover.xml"
+        "test:cc": "XDEBUG_MODE=coverage php vendor/bin/pest --coverage --coverage-clover=.build/phpunit/logs/clover.xml",
+        "refactor": "php vendor/bin/rector process --config=rector.php",
+        "refactor:ci": "php vendor/bin/rector process --config=rector.php --dry-run --ansi"
     }
 }

composer.lock

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config;
+use Rector\Php81;
+use Rector\PHPUnit;
+use Rector\ValueObject;
+
+return static function (Config\RectorConfig $rectorConfig): void {
+    $rectorConfig->cacheDirectory(__DIR__ . '/.build/rector/');
+
+    $rectorConfig->import(__DIR__ . '/vendor/fakerphp/faker/rector-migrate.php');
+
+    $rectorConfig->paths([
+        __DIR__ . '/config/',
+        __DIR__ . '/src/',
+        __DIR__ . '/tests/',
+        __DIR__ . '/.php-cs-fixer.dist.php',
+        __DIR__ . '/rector.php',
+    ]);
+
+    $rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_82);
+
+    $rectorConfig->rules([
+        Php81\Rector\Property\ReadOnlyPropertyRector::class,
+    ]);
+
+    $rectorConfig->sets([
+        PHPUnit\Set\PHPUnitSetList::PHPUNIT_100,
+    ]);
+};