From 4c0b11f6084596dd7aa4858f199d8b384ad59393 Mon Sep 17 00:00:00 2001
From: Luka Dschaak <l.dschaak@neusta.de>
Date: Tue, 19 Nov 2024 11:17:38 +0100
Subject: [PATCH 1/2] update php to 8.3 and mariadb to latest patch version
 10.11.10

---
 .github/workflows/qa.yaml    | 2 +-
 .github/workflows/tests.yaml | 7 +++++--
 compose.yaml                 | 6 +++---
 composer.json                | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
index 41038e3..668d181 100644
--- a/.github/workflows/qa.yaml
+++ b/.github/workflows/qa.yaml
@@ -22,7 +22,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 b880135..7ad1be8 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -28,6 +28,9 @@ jobs:
           - php-version: "8.2"
             dependencies: "highest"
             phpunit-flags: "--fail-on-risky"
+          - php-version: "8.3"
+            dependencies: "highest"
+            phpunit-flags: "--fail-on-risky"
 
     env:
       MYSQL_HOST: 127.0.0.1
@@ -35,11 +38,11 @@ jobs:
       MYSQL_USER: root
       MYSQL_PASSWORD: pimcore
       MYSQL_DATABASE: pimcore
-      MYSQL_SERVER_VERSION: "10.11.5-MariaDB"
+      MYSQL_SERVER_VERSION: "10.11.10-MariaDB"
 
     services:
       mariadb:
-        image: mariadb:10.11.5
+        image: mariadb:10.11.10
         env:
           MYSQL_ROOT_PASSWORD: pimcore
         options: >-
diff --git a/compose.yaml b/compose.yaml
index 065db0c..61983c1 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
@@ -16,11 +16,11 @@ services:
       timeout: 10s
 
   php:
-    image: pimcore/pimcore:php8.2-latest
+    image: pimcore/pimcore:php8.3-latest
     volumes:
       - ./:/var/www/html/
     environment:
-      MYSQL_SERVER_VERSION: mariadb-10.11.4
+      MYSQL_SERVER_VERSION: mariadb-10.11.10
     depends_on:
       database:
         condition: service_healthy
diff --git a/composer.json b/composer.json
index 758fd34..4c7d48d 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     }
   ],
   "require": {
-    "php": "~8.1.0 || ~8.2.0",
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
     "doctrine/persistence": "^2.2 || ^3.0",
     "phpunit/phpunit": "^9.6.0",
     "pimcore/pimcore": "^10.5 || ~11.0.0 || ~11.1.0 || ~11.2.2 || ~11.3.0 || ~11.4.0",

From b5c5a127d0d7c872787112ab2956e29a7366d360 Mon Sep 17 00:00:00 2001
From: Luka Dschaak <l.dschaak@neusta.de>
Date: Tue, 19 Nov 2024 12:18:08 +0100
Subject: [PATCH 2/2] fix MYSQL_SERVER_VERSION value

---
 compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yaml b/compose.yaml
index 61983c1..fee3f3b 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -20,7 +20,7 @@ services:
     volumes:
       - ./:/var/www/html/
     environment:
-      MYSQL_SERVER_VERSION: mariadb-10.11.10
+      MYSQL_SERVER_VERSION: "10.11.10-MariaDB"
     depends_on:
       database:
         condition: service_healthy