From 2c8e4b1646cfc167d9e8644460602c1f552be34f Mon Sep 17 00:00:00 2001 From: mattamon Date: Thu, 17 Oct 2024 11:12:16 +0200 Subject: [PATCH 1/8] Upgrading bundles --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index daff1cd..bc885c6 100644 --- a/composer.json +++ b/composer.json @@ -13,14 +13,14 @@ "prefer-stable": true, "minimum-stability": "dev", "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.3.0", "ext-fileinfo": "*", "ext-json": "*", - "doctrine/dbal": "^2.12 || ^3.5", + "doctrine/dbal": "^4.0", "dragonmantank/cron-expression": "^3.1", "league/flysystem-sftp-v3": "^3.0", - "nesbot/carbon": "^2.27", - "phpoffice/phpspreadsheet": "^1.24 || ^2.2", + "nesbot/carbon": "^3.8.0", + "phpoffice/phpspreadsheet": "^3.3.0", "pimcore/compatibility-bridge-v10": "^1.0", "pimcore/data-hub": "^1.6", "pimcore/pimcore": "^10.6 || ^11.0", From 8902216d5f8f1fb06310594b17f6dbf404dc60b9 Mon Sep 17 00:00:00 2001 From: mattamon Date: Thu, 17 Oct 2024 11:16:53 +0200 Subject: [PATCH 2/8] Update workflows --- .github/workflows/codeception.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml index 0d69f30..472ce5e 100644 --- a/.github/workflows/codeception.yml +++ b/.github/workflows/codeception.yml @@ -28,7 +28,7 @@ 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: 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 } services: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 8c24891..a4e5992 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: include: - - { php-version: "8.0", dependencies: "lowest", require_admin_bundle: false } + - { php-version: "8.3", 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 } steps: From b53f605df518a4b90ff4742549d95687e0cd32e9 Mon Sep 17 00:00:00 2001 From: mattamon Date: Thu, 17 Oct 2024 11:24:27 +0200 Subject: [PATCH 3/8] Removing Pimcore 10.6 support and upgrading testing modules --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index bc885c6..d25756c 100644 --- a/composer.json +++ b/composer.json @@ -23,16 +23,16 @@ "phpoffice/phpspreadsheet": "^3.3.0", "pimcore/compatibility-bridge-v10": "^1.0", "pimcore/data-hub": "^1.6", - "pimcore/pimcore": "^10.6 || ^11.0", + "pimcore/pimcore": "^11.0", "symfony/mime": "^5.2 || ^6.2", "webmozarts/console-parallelization": "^1.2.0 || ^2.0.0" }, "require-dev": { - "codeception/codeception": "^4.1.12 || ^5.0.3", + "codeception/codeception": "^5.0.3", "codeception/module-asserts": "^2", - "codeception/module-symfony": "^1.6.0 || ^3.1.0", + "codeception/module-symfony": "^3.1.0", "codeception/phpunit-wrapper": "^9", - "phpstan/phpstan": "^1.9.11", + "phpstan/phpstan": "1.12.5", "phpunit/phpunit": "^9.3" }, "suggest": { From 548a5789412be6491c072eae870964f07fdfb7c8 Mon Sep 17 00:00:00 2001 From: mattamon Date: Thu, 17 Oct 2024 11:27:24 +0200 Subject: [PATCH 4/8] Update pimcore version --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d25756c..d0c0acf 100644 --- a/composer.json +++ b/composer.json @@ -16,14 +16,14 @@ "php": "~8.3.0", "ext-fileinfo": "*", "ext-json": "*", - "doctrine/dbal": "^4.0", + "doctrine/dbal": "^3.8", "dragonmantank/cron-expression": "^3.1", "league/flysystem-sftp-v3": "^3.0", "nesbot/carbon": "^3.8.0", "phpoffice/phpspreadsheet": "^3.3.0", "pimcore/compatibility-bridge-v10": "^1.0", "pimcore/data-hub": "^1.6", - "pimcore/pimcore": "^11.0", + "pimcore/pimcore": "^11.3", "symfony/mime": "^5.2 || ^6.2", "webmozarts/console-parallelization": "^1.2.0 || ^2.0.0" }, From 1f30eb87db6256f1a3dce3f927bdb1826757be7c Mon Sep 17 00:00:00 2001 From: mattamon Date: Thu, 17 Oct 2024 11:29:08 +0200 Subject: [PATCH 5/8] Downgrade nesbot/carbon --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d0c0acf..a2a6a3e 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "doctrine/dbal": "^3.8", "dragonmantank/cron-expression": "^3.1", "league/flysystem-sftp-v3": "^3.0", - "nesbot/carbon": "^3.8.0", + "nesbot/carbon": "^2.65", "phpoffice/phpspreadsheet": "^3.3.0", "pimcore/compatibility-bridge-v10": "^1.0", "pimcore/data-hub": "^1.6", From 61589cf862bc751cd2c6841fbf5425a1aa1d3971 Mon Sep 17 00:00:00 2001 From: mattamon Date: Thu, 17 Oct 2024 11:38:17 +0200 Subject: [PATCH 6/8] Add classic-ui --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index a2a6a3e..a5d645c 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,7 @@ "pimcore/compatibility-bridge-v10": "^1.0", "pimcore/data-hub": "^1.6", "pimcore/pimcore": "^11.3", + "pimcore/admin-ui-classic-bundle": "^1.6", "symfony/mime": "^5.2 || ^6.2", "webmozarts/console-parallelization": "^1.2.0 || ^2.0.0" }, From 9a59a666d6e3841f07215fa1835a1b3f95d70f1b Mon Sep 17 00:00:00 2001 From: mattamon Date: Thu, 17 Oct 2024 11:39:54 +0200 Subject: [PATCH 7/8] Downgrade phpspreadsheet --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a5d645c..d0adfdd 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "dragonmantank/cron-expression": "^3.1", "league/flysystem-sftp-v3": "^3.0", "nesbot/carbon": "^2.65", - "phpoffice/phpspreadsheet": "^3.3.0", + "phpoffice/phpspreadsheet": "^2.2", "pimcore/compatibility-bridge-v10": "^1.0", "pimcore/data-hub": "^1.6", "pimcore/pimcore": "^11.3", From 5e9b5f9dcf0ec8f635667b713f1a2e6edd58912b Mon Sep 17 00:00:00 2001 From: mattamon Date: Thu, 17 Oct 2024 11:46:05 +0200 Subject: [PATCH 8/8] Remove suggest since it is required anyways --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index d0adfdd..c7b5aea 100644 --- a/composer.json +++ b/composer.json @@ -36,9 +36,6 @@ "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/"