diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7589df8..5f6f151 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,26 +14,16 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 tools: composer:v2 - name: Checkout - uses: actions/checkout@v2 - - - name: Get Composer Cache Directory - id: composer-cache - run: | - echo "::set-output name=dir::$(composer config cache-files-dir)" - - - uses: actions/cache@v2 + uses: actions/checkout@v4 with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer + show-progress: false - - name: Install composer dependencies - run: composer install --no-interaction --no-progress + - name: Composer install + uses: ingenerator/github-composite-actions/cached-composer-install@v1 - name: Run unit tests run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 92b9e50..886809c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ ### Unreleased +### v1.2.0 (2025-07-23) + +* Require PHP 8.4 + ### v1.1.0 (2024-10-02) * Support PHP 8.3 diff --git a/composer.json b/composer.json index bed4dce..eeb8376 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "homepage": "https://github.com/ingenerator/microframework", "type": "library", "require": { - "php": "~8.3.0", + "php": "~8.4.0", "ingenerator/php-utils": "^2.0", "guzzlehttp/psr7": "^2.7" }, diff --git a/test/blackbox/README.md b/test/blackbox/README.md index 11edad4..6ade738 100644 --- a/test/blackbox/README.md +++ b/test/blackbox/README.md @@ -12,7 +12,7 @@ The tests are run against the **built version of the package**. To do this, we: matching the download archive that github will produce for that commit - including that it respects `export-ignore` and similar instructions in the .gitattributes. * Use composer to install that packaged tar, together with its dependencies, into a docker filesystem -* Then copies the entire built project into a php:8.3-apache image which runs as the test_subject. +* Then copies the entire built project into a php:8.4-apache image which runs as the test_subject. Note that this means when working locally, changes to the application code **will not be picked up by the test_subject automatically**. To update the test_subject you will need to **commit your changes** (so that they are included in the diff --git a/test/blackbox/docker-compose.yaml b/test/blackbox/docker-compose.yaml index 8a24d89..c111555 100644 --- a/test/blackbox/docker-compose.yaml +++ b/test/blackbox/docker-compose.yaml @@ -3,7 +3,7 @@ services: # The test_runner is the outside of the black box, it has a mounted copy of the full # codebase for running tests etc. test_runner: - image: php:8.3-apache + image: php:8.4-apache environment: - TEST_SUBJECT_BASE_URI=http://test_subject working_dir: /workspace @@ -30,7 +30,7 @@ services: # Then build the packaged library into an HTTP server with our expected config and environment # Note that we need to include composer to ensure that it will - FROM php:8.3-apache + FROM php:8.4-apache WORKDIR /var/www COPY --from=composer-builder /workspace/test/blackbox/implementation /var/www COPY --from=composer:2 /usr/bin/composer /usr/bin/composer