PHP 8.3 Support (#409)

* PHP 8.3 Support * Update codeception.yml * Update static-analysis.yml * Update codeception.yml * Update static-analysis.yml * Update static-analysis.yml --------- Co-authored-by: Christian Fasching <fashxp@users.noreply.github.com>
pimcore · Jun 12, 2024 · 69a4d70 · 69a4d70
1 parent d8ba00a
commit 69a4d70
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -29,8 +29,8 @@ jobs:
             matrix:
                 include:
                     - { php-version: 8.0, database: "mariadb:10.3", pimcore_version: "", dependencies: lowest, experimental: false, require_admin_bundle: false }
-                    - { php-version: 8.1, database: "mariadb:10.11", pimcore_version: "", dependencies: highest, experimental: false, require_admin_bundle: true }
-                    - { php-version: 8.2, database: "mariadb:10.11", pimcore_version: "11.x-dev as 11.0.0", dependencies: highest, experimental: true, require_admin_bundle: true }
+                    - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "", dependencies: highest, experimental: false, require_admin_bundle: true }
+                    - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "11.x-dev as 11.0.0", dependencies: highest, experimental: true, require_admin_bundle: true }
         services:
             mariadb:
                 image: "${{ matrix.database }}"

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -27,6 +27,7 @@ jobs:
     docs:
         name: "Generate docs Pimcore Docs Generator"
         runs-on: "ubuntu-latest"
+        if: ${{ github.repository == 'pimcore/data-importer' }}
         steps:
             - name: "Checkout code"
               uses: "actions/checkout@v3"
@@ -68,4 +69,3 @@ jobs:
               run: |
                   npm install
                   npm run build
-                  
diff --git a/.github/workflows/poeditor-export.yaml b/.github/workflows/poeditor-export.yaml
@@ -14,9 +14,10 @@ permissions:
 jobs:
     poeditor:
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'pimcore/data-importer' }}
         steps:
             - name: Trigger workflow in pimcore/poeditor-export-action
               env:
                   GH_TOKEN: ${{ secrets.POEDITOR_ACTION_TRIGGER_TOKEN }}
               run: |
-                  gh workflow run -R pimcore/poeditor-export-action poeditor-export.yaml
+                  gh workflow run -R pimcore/poeditor-export-action poeditor-export.yaml
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -20,8 +20,8 @@ jobs:
             matrix:
                 include:
                     - { php-version: "8.0", dependencies: "lowest", require_admin_bundle: false }
-                    - { php-version: "8.1", dependencies: "highest", require_admin_bundle: true }
-                    - { php-version: "8.2", dependencies: "highest", require_admin_bundle: true }
+                    - { php-version: "8.3", dependencies: "highest", require_admin_bundle: true }
+                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.0.0", require_admin_bundle: true, experimental: true }
         steps:
             - name: "Checkout code"
               uses: "actions/checkout@v2"
@@ -38,6 +38,14 @@ jobs:
               run: |
                   .github/ci/scripts/setup-pimcore-environment.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:

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
   "minimum-stability": "dev",
   "require": {
     "pimcore/compatibility-bridge-v10": "^1.0",
-    "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
+    "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
     "ext-fileinfo": "*",
     "ext-json": "*",
     "dragonmantank/cron-expression": "^3.1",