From 1d80d59dbb58667d5be0190e6586beda7da4b4ac Mon Sep 17 00:00:00 2001
From: Christian Fasching <fashxp@users.noreply.github.com>
Date: Wed, 12 Jun 2024 09:11:10 +0200
Subject: [PATCH] Added php 8.3 support (#166)

* added php 8.3 support

* Update codeception.yaml

* Update static-analysis.yaml
---
 .github/workflows/codeception.yaml     | 15 ++++++++++++---
 .github/workflows/static-analysis.yaml |  5 +++--
 composer.json                          |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeception.yaml b/.github/workflows/codeception.yaml
index bfa374e3..f09d9db5 100644
--- a/.github/workflows/codeception.yaml
+++ b/.github/workflows/codeception.yaml
@@ -30,8 +30,9 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php-version: 8.2, dependencies: lowest, pimcore_version: "", experimental: false }
-                    - { php-version: 8.2, dependencies: highest, pimcore_version: "", experimental: false }
+                    - { php-version: "8.2", dependencies: "lowest", pimcore_version: "", experimental: false }
+                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "", experimental: false }
+                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.99.9", experimental: true }                    
 
         services:
             mariadb:
@@ -90,6 +91,14 @@ jobs:
                   chmod 755 .github/ci/scripts/setup-pimcore-environment-functional-tests.sh
                   .github/ci/scripts/setup-pimcore-environment-functional-tests.sh
 
+            - name: "Update Pimcore version"
+              env:
+                  PIMCORE_VERSION: "${{ matrix.pimcore_version }}"
+              run: |
+                  if [ ! -z "$PIMCORE_VERSION" ]; then
+                      composer require --no-update pimcore/pimcore:"${PIMCORE_VERSION}"
+                  fi  
+
             -   name: "Install dependencies with Composer"
                 uses: "ramsey/composer-install@v2"
                 with:
@@ -97,4 +106,4 @@ jobs:
 
             -   name: "Run Codeception"
                 run: |
-                    vendor/bin/codecept run -c . -vvv --xml --coverage-xml
\ No newline at end of file
+                    vendor/bin/codecept run -c . -vvv --xml --coverage-xml
diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
index d5481c97..c01c1515 100644
--- a/.github/workflows/static-analysis.yaml
+++ b/.github/workflows/static-analysis.yaml
@@ -25,7 +25,8 @@ jobs:
             matrix:
                 include:
                     - { php-version: "8.2", dependencies: "lowest", experimental: false }
-                    - { php-version: "8.2", dependencies: "highest", pimcore_version: "11.x-dev as 11.99.9", experimental: true }
+                    - { php-version: "8.3", dependencies: "highest", experimental: false }
+                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.99.9", experimental: true }
         steps:
             - name: "Checkout code"
               uses: "actions/checkout@v2"
@@ -62,4 +63,4 @@ jobs:
               uses: actions/upload-artifact@v2
               with:
                   name: phpstan-baseline.neon
-                  path: phpstan-baseline.neon
\ No newline at end of file
+                  path: phpstan-baseline.neon
diff --git a/composer.json b/composer.json
index de14fece..60e3e2d8 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
   "prefer-stable": true,
   "minimum-stability": "dev",
   "require": {
-    "php": "~8.2.0",
+    "php": "~8.2.0 || ~8.3.0 ",
     "pimcore/pimcore": "^11.2.0",
     "pimcore/static-resolver-bundle": "^1.4.0",
     "pimcore/opensearch-client": "^1.0.0",