From d9ee7ed66f9ad22a3323738271ecd409663233e1 Mon Sep 17 00:00:00 2001 From: michalsn Date: Sun, 19 Apr 2026 17:45:49 +0200 Subject: [PATCH 1/3] require PHP 8.3 for supported PHPUnit releases --- composer.json | 12 +++---- .../{phpunit.xml.dist => phpunit.dist.xml} | 33 +++++++++---------- 2 files changed, 21 insertions(+), 24 deletions(-) rename src/Template/{phpunit.xml.dist => phpunit.dist.xml} (89%) diff --git a/composer.json b/composer.json index 3fc3f41..691d259 100644 --- a/composer.json +++ b/composer.json @@ -22,23 +22,23 @@ ], "homepage": "https://github.com/codeigniter4/devkit", "require": { - "php": "^8.1", - "codeigniter/coding-standard": "^1.5", - "fakerphp/faker": "^1.9", + "php": "^8.3", + "codeigniter/coding-standard": "^1.9", + "fakerphp/faker": "^1.24", "mikey179/vfsstream": "^1.6", - "nexusphp/cs-config": "^3.6", + "nexusphp/cs-config": "^3.28", "nexusphp/tachycardia": "^2.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^2.0", "phpstan/phpstan-deprecation-rules": "^2.0", "phpstan/phpstan-phpunit": "^2.0", - "phpunit/phpunit": "^10.5 || ^11.5", + "phpunit/phpunit": "^12.5.22 || ^13.1.7", "rector/rector": "^2.0", "roave/security-advisories": "dev-latest", "vimeo/psalm": "^5.0 || ^6.0" }, "require-dev": { - "codeigniter4/framework": "^4.1", + "codeigniter4/framework": "^4.7", "icanhazstring/composer-unused": "dev-main" }, "minimum-stability": "dev", diff --git a/src/Template/phpunit.xml.dist b/src/Template/phpunit.dist.xml similarity index 89% rename from src/Template/phpunit.xml.dist rename to src/Template/phpunit.dist.xml index 9f94112..175ba32 100644 --- a/src/Template/phpunit.xml.dist +++ b/src/Template/phpunit.dist.xml @@ -1,22 +1,19 @@ - - + @@ -46,6 +43,16 @@ + + + ./app/ + + + ./app/Config + ./app/Views + + + @@ -68,14 +75,4 @@ --> - - - - ./app/ - - - ./app/Config - ./app/Views - - From 4c11d7767c2d944d46b0c70f2e35b87e2cf49b18 Mon Sep 17 00:00:00 2001 From: michalsn Date: Sun, 19 Apr 2026 17:51:22 +0200 Subject: [PATCH 2/3] chore: align workflow templates with PHP 8.3 baseline --- src/Template/.github/workflows/deptrac.yml | 2 +- src/Template/.github/workflows/infection.yml | 2 +- src/Template/.github/workflows/phpcpd.yml | 2 +- src/Template/.github/workflows/phpcsfixer.yml | 2 +- src/Template/.github/workflows/phpstan.yml | 2 +- src/Template/.github/workflows/phpunit.yml | 4 ++-- src/Template/.github/workflows/psalm.yml | 2 +- src/Template/.github/workflows/rector.yml | 2 +- src/Template/.github/workflows/unused.yml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Template/.github/workflows/deptrac.yml b/src/Template/.github/workflows/deptrac.yml index 0b51db8..d44fb05 100644 --- a/src/Template/.github/workflows/deptrac.yml +++ b/src/Template/.github/workflows/deptrac.yml @@ -31,7 +31,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.3' extensions: intl, json, mbstring, xml coverage: none env: diff --git a/src/Template/.github/workflows/infection.yml b/src/Template/.github/workflows/infection.yml index c19bd5e..68187d8 100644 --- a/src/Template/.github/workflows/infection.yml +++ b/src/Template/.github/workflows/infection.yml @@ -23,7 +23,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' tools: infection, phpunit extensions: intl, json, mbstring, gd, xml, sqlite3 coverage: xdebug diff --git a/src/Template/.github/workflows/phpcpd.yml b/src/Template/.github/workflows/phpcpd.yml index 247f768..468492c 100644 --- a/src/Template/.github/workflows/phpcpd.yml +++ b/src/Template/.github/workflows/phpcpd.yml @@ -27,7 +27,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.3' tools: phpcpd extensions: dom, mbstring coverage: none diff --git a/src/Template/.github/workflows/phpcsfixer.yml b/src/Template/.github/workflows/phpcsfixer.yml index bd74a5f..45ab00c 100644 --- a/src/Template/.github/workflows/phpcsfixer.yml +++ b/src/Template/.github/workflows/phpcsfixer.yml @@ -27,7 +27,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.3' extensions: json, tokenizer coverage: none env: diff --git a/src/Template/.github/workflows/phpstan.yml b/src/Template/.github/workflows/phpstan.yml index eb62cd4..74e6838 100644 --- a/src/Template/.github/workflows/phpstan.yml +++ b/src/Template/.github/workflows/phpstan.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.1', '8.2', '8.3', '8.4'] + php-versions: ['8.3', '8.5'] steps: - name: Checkout diff --git a/src/Template/.github/workflows/phpunit.yml b/src/Template/.github/workflows/phpunit.yml index 5df1604..1148d4e 100644 --- a/src/Template/.github/workflows/phpunit.yml +++ b/src/Template/.github/workflows/phpunit.yml @@ -25,7 +25,7 @@ jobs: if: (! contains(github.event.head_commit.message, '[ci skip]')) strategy: matrix: - php-versions: ['8.1', '8.2', '8.3', '8.4'] + php-versions: ['8.3', '8.4', '8.5'] steps: - name: Checkout @@ -65,7 +65,7 @@ jobs: TERM: xterm-256color TACHYCARDIA_MONITOR_GA: enabled - - if: matrix.php-versions == '8.1' + - if: matrix.php-versions == '8.3' name: Run Coveralls continue-on-error: true run: | diff --git a/src/Template/.github/workflows/psalm.yml b/src/Template/.github/workflows/psalm.yml index 985c0f3..3257113 100644 --- a/src/Template/.github/workflows/psalm.yml +++ b/src/Template/.github/workflows/psalm.yml @@ -31,7 +31,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.3' tools: phpstan, phpunit extensions: intl, json, mbstring, xml coverage: none diff --git a/src/Template/.github/workflows/rector.yml b/src/Template/.github/workflows/rector.yml index 8694f14..3514a44 100644 --- a/src/Template/.github/workflows/rector.yml +++ b/src/Template/.github/workflows/rector.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.1', '8.2', '8.3', '8.4'] + php-versions: ['8.3', '8.5'] steps: - name: Checkout diff --git a/src/Template/.github/workflows/unused.yml b/src/Template/.github/workflows/unused.yml index 616d24b..255cb96 100644 --- a/src/Template/.github/workflows/unused.yml +++ b/src/Template/.github/workflows/unused.yml @@ -29,7 +29,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.3' tools: composer, composer-unused extensions: intl, json, mbstring, xml coverage: none From 545e928e0fa2b26543481769d6960cc5e1d7f063 Mon Sep 17 00:00:00 2001 From: michalsn Date: Sun, 19 Apr 2026 18:03:37 +0200 Subject: [PATCH 3/3] chore: align project workflows with PHP 8.3 baseline --- .github/workflows/phpcsfixer.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/psalm.yml | 2 +- .github/workflows/rector.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml index c2bb3ee..877c7ea 100644 --- a/.github/workflows/phpcsfixer.yml +++ b/.github/workflows/phpcsfixer.yml @@ -27,7 +27,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.3' extensions: json, tokenizer coverage: none env: diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 258c407..a2d78f1 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.1', '8.2', '8.3', '8.4'] + php-versions: ['8.3', '8.5'] steps: - name: Checkout diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 999e9d9..e82c04d 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -31,7 +31,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.3' tools: phpstan, phpunit extensions: intl, json, mbstring, xml coverage: none diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index 55f8bd7..343241f 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.1', '8.2', '8.3', '8.4'] + php-versions: ['8.3', '8.5'] steps: - name: Checkout