update php and pimcore, fix deprecations (#165)

pimcore · Jan 17, 2025 · 49442db · 49442db
1 parent 1d8804f
commit 49442db
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/.github/ci/scripts/setup-pimcore-environment.sh b/.github/ci/scripts/setup-pimcore-environment.sh
@@ -15,10 +15,3 @@ chmod 755 bin/console
 cp -r .github/ci/files/kernel/. kernel
 cp -r .github/ci/files/public/. public
 
-if [ ${REQUIRE_ADMIN_BUNDLE} = true ]; then
-    composer require -n --no-update pimcore/admin-ui-classic-bundle:^1.0
-else
-    ## Todo Remove when dropping support for Pimcore 10
-    rm config/packages/security.yaml
-    cp .github/ci/files/security.yaml config/packages
-fi
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -27,9 +27,9 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { 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: "", dependencies: highest, experimental: false, require_admin_bundle: true }
-                    - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "11.x-dev", dependencies: highest, experimental: true, require_admin_bundle: true }
+                    - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "", dependencies: highest, experimental: false }
+                    - { php-version: 8.4, database: "mariadb:10.11", pimcore_version: "", dependencies: highest, experimental: false }
+                    - { php-version: 8.4, database: "mariadb:10.11", pimcore_version: "12.x-dev", dependencies: highest, experimental: true }
         services:
             mariadb:
                 image: "${{ matrix.database }}"
@@ -58,8 +58,6 @@ jobs:
                   done
 
             - name: "Setup Pimcore environment"
-              env:
-                  REQUIRE_ADMIN_BUNDLE: "${{ matrix.require_admin_bundle }}"
               run: |
                   mysql -e "CREATE DATABASE pimcore_test CHARSET=utf8mb4;"
                   chmod 755 .github/ci/scripts/setup-pimcore-environment.sh

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -20,9 +20,9 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php-version: "8.1", dependencies: "highest", pimcore_version: "", phpstan_args: "", experimental: false, require_admin_bundle: true }
-                    - { php-version: "8.2", dependencies: "highest", pimcore_version: "", phpstan_args: "", experimental: false, require_admin_bundle: true }
-                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev", phpstan_args: "", experimental: true, require_admin_bundle: true }
+                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "", phpstan_args: "", experimental: false }
+                    - { php-version: "8.4", dependencies: "highest", pimcore_version: "", phpstan_args: "", experimental: false }
+                    - { php-version: "8.4", dependencies: "highest", pimcore_version: "12.x-dev", phpstan_args: "", experimental: true }
         steps:
             - name: "Checkout code"
               uses: "actions/checkout@v2"
@@ -34,8 +34,6 @@ jobs:
                   php-version: "${{ matrix.php-version }}"
 
             - name: "Setup Pimcore environment"
-              env:
-                  REQUIRE_ADMIN_BUNDLE: "${{ matrix.require_admin_bundle }}"
               run: |
                   .github/ci/scripts/setup-pimcore-environment.sh
 

diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
   "minimum-stability": "dev",
   "require": {
     "pimcore/compatibility-bridge-v10": "^1.0",
-    "pimcore/admin-ui-classic-bundle": "^1.0",
-    "pimcore/pimcore": "^11.2",
+    "pimcore/admin-ui-classic-bundle": "^1.0 || 2.x-dev",
+    "pimcore/pimcore": "^11.2 || 12.x-dev",
     "symfony/http-foundation": "^6.3"
   },
   "require-dev": {