From 148a60e51c1f6334cdd6077f8d4992072d0639a5 Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Wed, 18 Feb 2026 17:31:39 +0100 Subject: [PATCH] update mastercontainer to php 8.5 Signed-off-by: Simon L. --- .github/workflows/dependency-updates.yml | 2 +- .github/workflows/lint-php.yml | 2 +- .github/workflows/php-deprecation-detector.yml | 2 +- .github/workflows/playwright-on-push.yml | 4 ++-- .github/workflows/psalm-update-baseline.yml | 2 +- .github/workflows/psalm.yml | 2 +- .github/workflows/twig-lint.yml | 2 +- Containers/mastercontainer/Dockerfile | 4 ++-- php/composer.json | 4 ++-- php/composer.lock | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index 3805a0d0..ef286f86 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - uses: shivammathur/setup-php@7bf05c6b704e0b9bfee22300130a31b5ea68d593 # v2 with: - php-version: 8.4 + php-version: 8.5 extensions: apcu - name: Run dependency update script run: | diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index c0d2d577..eb54bc02 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ "8.4" ] + php-versions: [ "8.5" ] name: php-lint diff --git a/.github/workflows/php-deprecation-detector.yml b/.github/workflows/php-deprecation-detector.yml index 38b0fa8d..e423ba0a 100644 --- a/.github/workflows/php-deprecation-detector.yml +++ b/.github/workflows/php-deprecation-detector.yml @@ -20,7 +20,7 @@ jobs: - name: Set up php uses: shivammathur/setup-php@7bf05c6b704e0b9bfee22300130a31b5ea68d593 # v2 with: - php-version: 8.4 + php-version: 8.5 extensions: apcu coverage: none diff --git a/.github/workflows/playwright-on-push.yml b/.github/workflows/playwright-on-push.yml index 40277e57..c9dfd5e2 100644 --- a/.github/workflows/playwright-on-push.yml +++ b/.github/workflows/playwright-on-push.yml @@ -36,11 +36,11 @@ jobs: - name: Install Playwright Browsers run: cd php/tests && npx playwright install --with-deps chromium - - name: Set up php 8.4 + - name: Set up php 8.5 uses: shivammathur/setup-php@7bf05c6b704e0b9bfee22300130a31b5ea68d593 # v2.36.0 with: extensions: apcu - php-version: 8.4 + php-version: 8.5 coverage: none ini-file: development env: diff --git a/.github/workflows/psalm-update-baseline.yml b/.github/workflows/psalm-update-baseline.yml index bcbb12c3..e83a6376 100644 --- a/.github/workflows/psalm-update-baseline.yml +++ b/.github/workflows/psalm-update-baseline.yml @@ -15,7 +15,7 @@ jobs: - name: Set up php uses: shivammathur/setup-php@7bf05c6b704e0b9bfee22300130a31b5ea68d593 # v2 with: - php-version: 8.4 + php-version: 8.5 extensions: apcu coverage: none diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 2bab876e..354222b8 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -39,7 +39,7 @@ jobs: - name: Set up php uses: shivammathur/setup-php@7bf05c6b704e0b9bfee22300130a31b5ea68d593 # v2.36.0 with: - php-version: 8.4 + php-version: 8.5 extensions: apcu coverage: none ini-file: development diff --git a/.github/workflows/twig-lint.yml b/.github/workflows/twig-lint.yml index 27b8776d..910ecbf5 100644 --- a/.github/workflows/twig-lint.yml +++ b/.github/workflows/twig-lint.yml @@ -29,7 +29,7 @@ jobs: - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@7bf05c6b704e0b9bfee22300130a31b5ea68d593 # v2 with: - php-version: 8.4 + php-version: 8.5 extensions: apcu coverage: none diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile index ca613e39..379fc4dc 100644 --- a/Containers/mastercontainer/Dockerfile +++ b/Containers/mastercontainer/Dockerfile @@ -5,8 +5,8 @@ FROM docker:29.2.1-cli AS docker # Caddy is a requirement FROM caddy:2.10.2-alpine AS caddy -# From https://github.com/docker-library/php/blob/master/8.4/alpine3.23/fpm/Dockerfile -FROM php:8.4.18-fpm-alpine3.23 +# From https://github.com/docker-library/php/blob/master/8.5/alpine3.23/fpm/Dockerfile +FROM php:8.5.3-fpm-alpine3.23 EXPOSE 80 EXPOSE 8080 diff --git a/php/composer.json b/php/composer.json index de8be9d8..1e4b5c0e 100644 --- a/php/composer.json +++ b/php/composer.json @@ -5,7 +5,7 @@ } }, "require": { - "php": "8.4.*", + "php": "8.5.*", "ext-json": "*", "ext-sodium": "*", "ext-curl": "*", @@ -34,6 +34,6 @@ "psalm:strict": "psalm --threads=1 --show-info=true", "lint": "php -l src/*.php src/**/*.php public/index.php", "lint:twig": "twig-linter lint ./templates", - "php-deprecation-detector": "phpdd scan -n -t 8.4 src/*.php src/**/*.php public/index.php" + "php-deprecation-detector": "phpdd scan -n -t 8.5 src/*.php src/**/*.php public/index.php" } } diff --git a/php/composer.lock b/php/composer.lock index c366f518..6a807c35 100644 --- a/php/composer.lock +++ b/php/composer.lock @@ -4953,7 +4953,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "8.4.*", + "php": "8.5.*", "ext-json": "*", "ext-sodium": "*", "ext-curl": "*",