From 95c90a0fd56bb3848c59cc08fc2e9f5e837dad89 Mon Sep 17 00:00:00 2001 From: Maximilian Graf Schimmelmann Date: Sun, 20 Apr 2025 12:42:16 +0200 Subject: [PATCH 1/3] Deprecate PHP7.4, adapt docker compose file. --- composer.json | 8 ++++---- docker-compose.yml | 2 -- docker/php/Dockerfile | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index d6a251b..a087447 100644 --- a/composer.json +++ b/composer.json @@ -9,19 +9,19 @@ "variadic", "consecutive params" ], - "homepage": "https://github.com/nopenopenope/behat-test-runner", + "homepage": "https://www.bytes-commerce.de", "license": "GPL-3.0-or-later", "minimum-stability": "dev", "authors": [ { "name": "Maximilian Graf Schimmelmann", - "email": "max@schimmelmann.org", - "homepage": "https://www.schimmelmann.org", + "email": "office@bytes-commerce.de", + "homepage": "https://www.bytes-commerce.de", "role": "Developer" } ], "require": { - "php": "^7.4|^8.0" + "php": "^8.0" }, "require-dev": { "phpstan/phpstan": "^1.10", diff --git a/docker-compose.yml b/docker-compose.yml index ebb5ba9..4f6239d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: php: build: diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 8ef4b5a..1e98899 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,12 +1,12 @@ -FROM php:8.2.7-zts-alpine3.18 +FROM php:8.3 WORKDIR /var/www/html/ ENV COMPOSER_ALLOW_SUPERUSER=1 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer -RUN apk add --update linux-headers -RUN apk add -u \ +RUN apt update +RUN apt install -y \ nano \ wget \ unzip \ From b0fe014affaffcda1baa62a12a96a4fba21ced30 Mon Sep 17 00:00:00 2001 From: Maximilian Graf Schimmelmann Date: Sun, 20 Apr 2025 13:14:22 +0200 Subject: [PATCH 2/3] Remove php74 tests from github pipeline. --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8000c3..b30f32d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,6 @@ jobs: strategy: matrix: php-version: - - "7.4" - "8.0" - "8.1" - "8.2" @@ -23,7 +22,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2" + uses: "actions/checkout@v4" - name: "Install PHP" uses: "shivammathur/setup-php@v2" From 4e41326f939f4fd7735ec87e695d0b6005d323b1 Mon Sep 17 00:00:00 2001 From: Maximilian Graf Schimmelmann Date: Sun, 20 Apr 2025 13:15:07 +0200 Subject: [PATCH 3/3] Upgrade checkout and cache to latest versions. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b30f32d..81c58f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: tools: composer:v2, cs2pr - name: "Cache dependencies" - uses: "actions/cache@v2" + uses: "actions/cache@v4" with: path: | ~/.composer/cache