From c0a1f36819df9a32acdb56ad57de9adcd41360df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCck?= Date: Sun, 15 Feb 2026 01:36:52 +0100 Subject: [PATCH 1/2] Update test environment to fix tests on legacy PHP 7.2 with PHPUnit 8.5 --- .github/workflows/ci.yml | 5 +---- composer.json | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32c0ba5..67cd208 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,10 +32,7 @@ jobs: coverage: ${{ matrix.php < 8.0 && 'xdebug' || 'pcov' }} ini-file: development - run: composer install - - run: vendor/bin/phpunit --coverage-text --coverage-clover=clover.xml - if: ${{ matrix.php >= 7.3 }} - - run: vendor/bin/phpunit --coverage-text --coverage-clover=clover.xml -c phpunit.xml.legacy - if: ${{ matrix.php < 7.3 }} + - run: vendor/bin/phpunit --coverage-text --coverage-clover=clover.xml ${{ matrix.php < 7.3 && '-c phpunit.xml.legacy' || '' }} - name: Check 100% code coverage shell: php {0} run: | diff --git a/composer.json b/composer.json index f2d3751..674edc0 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ }, "require-dev": { "phpstan/phpstan": "1.12.32 || 1.4.10", - "phpunit/phpunit": "^9.6 || ^7.5", + "phpunit/phpunit": "^9.6 || ^8.5 || ^7.5", "psr/container": "^2 || ^1" }, "autoload": { From 373ab3e2816dd9b3b3106ea6cf74ad09179dcef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCck?= Date: Sun, 15 Feb 2026 01:49:18 +0100 Subject: [PATCH 2/2] Update test environment to tag Docker images on build --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67cd208..13ca2e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,8 +105,8 @@ jobs: with: php-version: 8.5 - run: composer install -d tests/integration/ - - run: docker build -f tests/integration/${{ matrix.dockerfile }} tests/integration/ - - run: docker run -d -p 8080:8080 -v "$PWD/composer.json":/app/composer.json $(docker images -q | head -n1) + - run: docker build -t fx -f tests/integration/${{ matrix.dockerfile }} tests/integration/ + - run: docker run -d -p 8080:8080 -v "$PWD/composer.json":/app/composer.json fx - run: bash tests/await.bash - run: bash tests/integration.bash - run: docker stop $(docker ps -qn1) @@ -129,8 +129,8 @@ jobs: with: php-version: 8.5 - run: composer install -d tests/integration/ - - run: docker build -f tests/integration/Dockerfile-basics tests/integration/ - - run: docker run -d -p 8080:8080 -v "$PWD/composer.json":/app/composer.json $(docker images -q | head -n1) + - run: docker build -t fx -f tests/integration/Dockerfile-basics tests/integration/ + - run: docker run -d -p 8080:8080 -v "$PWD/composer.json":/app/composer.json fx - run: docker run -d --net=host -v "$PWD/tests/integration/":/home/framework-x/ -v "$PWD"/tests/integration/${{ matrix.config.path }}:/etc/nginx/conf.d/default.conf nginx:stable-alpine - run: bash tests/await.bash http://localhost/ - run: bash tests/integration.bash http://localhost/