From 0f9ce1c5e411443445241bab91cd27b849389c0f Mon Sep 17 00:00:00 2001 From: Johannes Przymusinski Date: Tue, 19 Nov 2024 08:22:52 +0100 Subject: [PATCH 1/3] task: support PHP 8.3 --- .github/workflows/tests.yaml | 5 ++++- composer.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 657adb5..6a649d8 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -28,7 +28,10 @@ jobs: dependencies: "lowest" # Pimcore 10.5.0 - php-version: "8.2" dependencies: "highest" # Pimcore 11.* - + - php-version: "8.3" + dependencies: "lowest" # Pimcore 11.* + - php-version: "8.3" + dependencies: "highest" # Pimcore 11.* env: MYSQL_HOST: 127.0.0.1 MYSQL_PORT: 3306 diff --git a/composer.json b/composer.json index 4f73ffc..33c887e 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "php": "~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "pimcore/pimcore": "^10.5 || ^11.0" }, "require-dev": { From fe02408e648d6e396793ad90991ae1a5cc6515f8 Mon Sep 17 00:00:00 2001 From: Luka Dschaak Date: Tue, 19 Nov 2024 16:02:52 +0100 Subject: [PATCH 2/3] chore: update more php 8.3 references --- .github/workflows/qa.yaml | 2 +- .github/workflows/tests.yaml | 1 + compose.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index aba50cd..c396794 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -23,7 +23,7 @@ jobs: - name: PHP Setup uses: shivammathur/setup-php@v2 with: - php-version: 8.2 + php-version: 8.3 - name: Validate composer.json run: composer validate --ansi --strict diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 6a649d8..a2c50d2 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -32,6 +32,7 @@ jobs: dependencies: "lowest" # Pimcore 11.* - php-version: "8.3" dependencies: "highest" # Pimcore 11.* + env: MYSQL_HOST: 127.0.0.1 MYSQL_PORT: 3306 diff --git a/compose.yaml b/compose.yaml index 960eef0..8a727a5 100644 --- a/compose.yaml +++ b/compose.yaml @@ -16,7 +16,7 @@ services: timeout: 10s php: - image: pimcore/pimcore:php8.1-latest + image: pimcore/pimcore:php8.3-latest volumes: - ./:/var/www/html/ environment: From 9c42c47a7bde0fd9387adf6e29b55472480ac0a7 Mon Sep 17 00:00:00 2001 From: Luka Dschaak Date: Tue, 19 Nov 2024 16:03:07 +0100 Subject: [PATCH 3/3] chore: update mariadb to latest lts patch version --- compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yaml b/compose.yaml index 8a727a5..a6a5d8f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: database: - image: mariadb:10.11.4 + image: mariadb:10.11.10 command: [ "mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci" ] environment: MYSQL_ALLOW_EMPTY_PASSWORD: yes @@ -24,7 +24,7 @@ services: XDEBUG_MODE: debug # Use Host IP from Docker Daemon. See https://xdebug.org/docs/all_settings#client_host XDEBUG_CLIENT_HOST: "host.docker.internal" - MYSQL_SERVER_VERSION: mariadb-10.11.4 + MYSQL_SERVER_VERSION: 10.11.10-MariaDB extra_hosts: # See https://gitlab.neusta.de/NSD/p_pimcore/pimcore-project-template/-/blob/2.1.0/compose.dev.yaml#L18-L24 - "host.docker.internal:host-gateway"