[Task] Upgrade dependencies (#440)

* Upgrade dependencies * Add upgrade notes * Remove unecessary files
pimcore · Dec 2, 2024 · 336d65f · 336d65f
1 parent 6aaa082
commit 336d65f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 60 deletions.
diff --git a/.github/ci/files/security.yaml b/.github/ci/files/security.yaml
diff --git a/.github/ci/scripts/setup-pimcore-environment.sh b/.github/ci/scripts/setup-pimcore-environment.sh
@@ -11,12 +11,4 @@ cp -r .github/ci/files/templates/. templates
 cp -r .github/ci/files/bin/console bin/console
 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
+cp -r .github/ci/files/public/. public
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -28,9 +28,9 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php-version: 8.0, database: "mariadb:10.3", pimcore_version: "", dependencies: lowest, experimental: false, require_admin_bundle: false }
-                    - { 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 }
+                    - { php-version: 8.1, database: "mariadb:10.11", pimcore_version: "", dependencies: lowest, experimental: false }
+                    - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "", dependencies: highest, experimental: false }
+                    - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "11.x-dev", dependencies: highest, experimental: true }
         services:
             mariadb:
                 image: "${{ matrix.database }}"
@@ -59,8 +59,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
@@ -19,9 +19,9 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php-version: "8.0", dependencies: "lowest", require_admin_bundle: false }
-                    - { 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 }
+                    - { php-version: "8.1", dependencies: "lowest" }
+                    - { php-version: "8.3", dependencies: "highest" }
+                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev", experimental: true }
         steps:
             - name: "Checkout code"
               uses: "actions/checkout@v2"
@@ -33,8 +33,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
@@ -13,17 +13,17 @@
   "prefer-stable": true,
   "minimum-stability": "dev",
   "require": {
-    "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
     "ext-fileinfo": "*",
     "ext-json": "*",
-    "doctrine/dbal": "^2.12 || ^3.5",
+    "doctrine/dbal": "^2.12 || ^3.8",
     "dragonmantank/cron-expression": "^3.1",
     "league/flysystem-sftp-v3": "^3.0",
-    "nesbot/carbon": "^2.27",
-    "phpoffice/phpspreadsheet": "^1.24 || ^2.2",
-    "pimcore/compatibility-bridge-v10": "^1.0",
+    "nesbot/carbon": "^2.72",
+    "phpoffice/phpspreadsheet": "^2.2 || ^3.3",
+    "pimcore/admin-ui-classic-bundle": "^1.0",
     "pimcore/data-hub": "^1.6",
-    "pimcore/pimcore": "^10.6 || ^11.0",
+    "pimcore/pimcore": "^11.2",
     "symfony/mime": "^5.2 || ^6.2",
     "webmozarts/console-parallelization": "^1.2.0 || ^2.0.0"
   },
@@ -32,12 +32,9 @@
     "codeception/module-asserts": "^2",
     "codeception/module-symfony": "^1.6.0 || ^3.1.0",
     "codeception/phpunit-wrapper": "^9",
-    "phpstan/phpstan": "^1.9.11",
+    "phpstan/phpstan": "1.12.5",
     "phpunit/phpunit": "^9.3"
   },
-  "suggest": {
-    "pimcore/admin-ui-classic-bundle": "Required for Pimcore 11"
-  },
   "autoload": {
     "psr-4": {
       "Pimcore\\Bundle\\DataImporterBundle\\": "src/"

diff --git a/doc/03_Upgrade.md b/doc/03_Upgrade.md
@@ -0,0 +1,5 @@
+# Update Notes
+
+## Update to Version 1.10
+### General
+- Dropped support of Pimcore 10, bumped minimum requirement of `pimcore/pimcore` to `^11.2`.