task: support PHP 8.3 (#25)

* task: support PHP 8.3 * chore: update mariadb to latest lts patch version --------- Co-authored-by: Luka Dschaak <[email protected]>
teamneusta · Nov 19, 2024 · 740cc20 · 740cc20
1 parent 19aa261
commit 740cc20
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -28,6 +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

diff --git 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
@@ -16,15 +16,15 @@ services:
       timeout: 10s
 
   php:
-    image: pimcore/pimcore:php8.1-latest
+    image: pimcore/pimcore:php8.3-latest
     volumes:
       - ./:/var/www/html/
     environment:
       # Enable step debugging (will be activated by trigger). See https://xdebug.org/docs/all_settings#mode
       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"

diff --git 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": {