From 6307301914af3cf2218c0b1bcb3b4628dd7559b8 Mon Sep 17 00:00:00 2001 From: PabloKowalczyk <11366345+PabloKowalczyk@users.noreply.github.com> Date: Thu, 8 Jan 2026 16:22:22 +0100 Subject: [PATCH] Require at least PHP 8.2 --- .github/workflows/php.yaml | 14 ++------------ Makefile | 2 +- composer.json | 2 +- docker-compose.yml | 6 +++--- docker/{php81 => php82}/Dockerfile | 4 ++-- docker/{php81 => php82}/php.ini | 0 6 files changed, 9 insertions(+), 19 deletions(-) rename docker/{php81 => php82}/Dockerfile (83%) rename docker/{php81 => php82}/php.ini (100%) diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml index e2ff9b3..0269fbb 100644 --- a/.github/workflows/php.yaml +++ b/.github/workflows/php.yaml @@ -21,7 +21,6 @@ jobs: os: - 'ubuntu-22.04' php: - - '8.1' - '8.2' - '8.3' - '8.4' @@ -33,18 +32,9 @@ jobs: - '~7.1.0' include: - os: 'windows-2022' - php: '8.1' + php: '8.2' dependencies: 'highest' symfony_version: '~6.4.0' - exclude: - - os: 'ubuntu-22.04' - php: '8.1' - dependencies: 'lowest' - symfony_version: '~7.1.0' - - os: 'ubuntu-22.04' - php: '8.1' - dependencies: 'highest' - symfony_version: '~7.1.0' runs-on: ${{ matrix.os }} steps: @@ -77,7 +67,7 @@ jobs: strategy: matrix: include: - - php: '8.1' + - php: '8.2' symfony_version: '~6.4.0' dependencies: 'highest' runs-on: ubuntu-22.04 diff --git a/Makefile b/Makefile index 05f6212..4672d69 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,2 @@ sh-php: - docker compose exec --user=www-data php81 sh + docker compose exec --user=www-data php82 sh diff --git a/composer.json b/composer.json index 6dbb0e8..9fd3009 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ } ], "require": { - "php": ">=8.1", + "php": ">=8.2", "composer-runtime-api": "^2.0", "dragonmantank/cron-expression": "^3.4.0", "laravel/serializable-closure": "^2.0", diff --git a/docker-compose.yml b/docker-compose.yml index fb2e6b7..5325b6d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: - php81: + php82: build: - context: ./docker/php81 + context: ./docker/php82 working_dir: /var/www/html environment: CRUNZ_CONTAINER_DEBUG: 1 @@ -14,5 +14,5 @@ services: " volumes: - .:/var/www/html - - ./docker/php81/php.ini:/usr/local/etc/php/php.ini:ro + - ./docker/php82/php.ini:/usr/local/etc/php/php.ini:ro stop_grace_period: 1s diff --git a/docker/php81/Dockerfile b/docker/php82/Dockerfile similarity index 83% rename from docker/php81/Dockerfile rename to docker/php82/Dockerfile index c65bf33..905a917 100644 --- a/docker/php81/Dockerfile +++ b/docker/php82/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.30-cli-alpine +FROM php:8.2.30-cli-alpine RUN apk add --no-cache \ shadow \ @@ -18,5 +18,5 @@ RUN mkdir -p \ /var/log/php/error.log \ /var/www/.composer -COPY --from=composer/composer:2.8.2-bin /composer /usr/bin/composer +COPY --from=composer/composer:2.9.3-bin /composer /usr/bin/composer ENV COMPOSER_HOME /var/www/.composer diff --git a/docker/php81/php.ini b/docker/php82/php.ini similarity index 100% rename from docker/php81/php.ini rename to docker/php82/php.ini