From 04451a786dbd55c789135a4b39aacc98c63c0f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Kr=C3=A1l?= Date: Mon, 29 Jun 2026 06:58:10 +0200 Subject: [PATCH 1/2] ci: run all checks on a single worker for PHP 8.5 Drop the 8.4/8.5 build matrix so the test, PHPCS, PHPStan, Rector and unused-sniffs checks run once on a single worker, reducing GitHub Actions minutes usage. Closes #59 --- .github/workflows/ci.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4d3939..008327d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,15 +9,7 @@ on: jobs: test: runs-on: ubuntu-latest - strategy: - matrix: - php-version: ['8.4', '8.5'] - include: - - php-version: '8.4' - job-name: 'PHP 8.4' - - php-version: '8.5' - job-name: 'PHP 8.5' - name: ${{ matrix.job-name }} + name: Checks (PHP 8.5) steps: - name: Checkout code uses: actions/checkout@v5 @@ -33,7 +25,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-version }} + php-version: '8.5' - name: Install dependencies run: composer install --prefer-dist --no-progress --no-suggest From a6b5bfe876a2924b4344c36dcb144c3f80b0f555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Kr=C3=A1l?= Date: Mon, 29 Jun 2026 07:20:18 +0200 Subject: [PATCH 2/2] build: require PHP ^8.5 to match the CI test version Resolves the code-review finding that composer.json declared support for PHP 8.4 while CI only tests 8.5. Align the declared minimum, the dependency update workflow and the README with the single tested version. Refs #59 --- .github/workflows/composer-update.yml | 2 +- README.md | 2 +- composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/composer-update.yml b/.github/workflows/composer-update.yml index 2fac7d8..41fb88e 100644 --- a/.github/workflows/composer-update.yml +++ b/.github/workflows/composer-update.yml @@ -23,7 +23,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, dom, filter, gd, json, mbstring, pdo coverage: none diff --git a/README.md b/README.md index 6bef7b7..95297ae 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ vendor/bin/phpcbf --standard=vendor/pekral/phpcs-rules/ruleset.xml src/ ## ⚙️ Configuration - Rules can be extended and customized in `ruleset.xml`. -- Supports PHP 8.4+. +- Supports PHP 8.5+. - Easy integration with CI/CD (GitHub Actions, GitLab CI, ...). --- diff --git a/composer.json b/composer.json index b0486b4..e4fc673 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "test:coverage": "vendor/bin/phpunit --coverage-html coverage-report" }, "require": { - "php": "^8.4", + "php": "^8.5", "dealerdirect/phpcodesniffer-composer-installer": "^1.2.1", "slevomat/coding-standard": "^8.30.1" },