From 37fded201d0ab619aa548d0610e3d0c1cdd30b05 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 08:47:36 +0100 Subject: [PATCH 01/21] Update composer and ocv check. --- .github/workflows/osv-checks.yaml | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/osv-checks.yaml b/.github/workflows/osv-checks.yaml index 45a4982..9e62ab6 100644 --- a/.github/workflows/osv-checks.yaml +++ b/.github/workflows/osv-checks.yaml @@ -18,6 +18,7 @@ jobs: - { php-version: 8.1, platform-version: '2022.0' } - { php-version: 8.2, platform-version: '2023.3' } - { php-version: 8.3, platform-version: '2024.4' } + - { php-version: 8.4, platform-version: '2025.x' } with: php-version: ${{ matrix.php-version }} platform-version: ${{ matrix.platform-version }} diff --git a/composer.json b/composer.json index 3bf863c..d763595 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "pimcore/headless-documents": "<2.3 || > 2.3.99", "pimcore/newsletter-bundle": "<1.2 || > 1.2.99", "pimcore/object-merger": "<4.1 || > 4.1.99", - "pimcore/openid-connect": "<1.2 || > 1.2.99", + "pimcore/openid-connect": "<1.x-dev", "pimcore/output-data-config-toolkit-bundle": "<5.2 || > 5.2.99", "pimcore/personalization-bundle": "<1.1 || > 1.1.99", "pimcore/perspective-editor": "<1.8 || > 1.8.99", From c46e78b1f9de16c58f02f20985d92c978689a472 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 08:53:27 +0100 Subject: [PATCH 02/21] Update composer and ocv check. --- .github/workflows/osv-checks.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/osv-checks.yaml b/.github/workflows/osv-checks.yaml index 9e62ab6..fd8b77f 100644 --- a/.github/workflows/osv-checks.yaml +++ b/.github/workflows/osv-checks.yaml @@ -15,9 +15,9 @@ jobs: fail-fast: false matrix: include: - - { php-version: 8.1, platform-version: '2022.0' } - - { php-version: 8.2, platform-version: '2023.3' } - - { php-version: 8.3, platform-version: '2024.4' } + - { php-version: 8.1, platform-version: 'v2022.0' } + - { php-version: 8.2, platform-version: 'v2023.3' } + - { php-version: 8.3, platform-version: 'v2024.4' } - { php-version: 8.4, platform-version: '2025.x' } with: php-version: ${{ matrix.php-version }} From 2eb69492015d1d366b9703d766fb2a2fcee9cb70 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 08:56:54 +0100 Subject: [PATCH 03/21] Update composer. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d763595..b31cd11 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "pimcore/perspective-editor": "<1.8 || > 1.8.99", "pimcore/pimcore": "<12.x-dev", "pimcore/portal-engine": "<4.2 || > 4.2.99", - "pimcore/quill-bundle": "<1.0 || > 1.0.99", + "pimcore/quill-bundle": "<1.x-dev", "pimcore/static-resolver-bundle": "<1.4 || > 1.4.99", "pimcore/statistics-explorer": "<2.2 || > 2.2.99", "pimcore/system-info-bundle": "<1.0 || > 1.0.99", From 101d8acab34797e818d9346f18045a5a75960132 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 09:01:43 +0100 Subject: [PATCH 04/21] Update composer. --- .github/workflows/osv-checks.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/osv-checks.yaml b/.github/workflows/osv-checks.yaml index fd8b77f..2755a38 100644 --- a/.github/workflows/osv-checks.yaml +++ b/.github/workflows/osv-checks.yaml @@ -4,6 +4,8 @@ on: workflow_dispatch: schedule: - cron: '0 3 * * *' + pull_request: + types: [ opened, synchronize, reopened ] permissions: contents: read @@ -15,9 +17,9 @@ jobs: fail-fast: false matrix: include: - - { php-version: 8.1, platform-version: 'v2022.0' } - - { php-version: 8.2, platform-version: 'v2023.3' } - - { php-version: 8.3, platform-version: 'v2024.4' } + # - { php-version: 8.1, platform-version: 'v2022.0' } + # - { php-version: 8.2, platform-version: 'v2023.3' } + # - { php-version: 8.3, platform-version: 'v2024.4' } - { php-version: 8.4, platform-version: '2025.x' } with: php-version: ${{ matrix.php-version }} From 55db8b6268887453732335b5ed50ec6069f9584f Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 09:10:06 +0100 Subject: [PATCH 05/21] Update composer. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b31cd11..9d9419a 100644 --- a/composer.json +++ b/composer.json @@ -45,4 +45,4 @@ "pimcore/workflow-automation-integration-bundle": "<1.0 || > 1.0.99", "pimcore/workflow-designer": "<1.4 || > 1.4.99" } -} +} \ No newline at end of file From 963b75234f72c52034d02d7c7c6ffb2b1a2898c0 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 09:11:34 +0100 Subject: [PATCH 06/21] Update composer. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9d9419a..b31cd11 100644 --- a/composer.json +++ b/composer.json @@ -45,4 +45,4 @@ "pimcore/workflow-automation-integration-bundle": "<1.0 || > 1.0.99", "pimcore/workflow-designer": "<1.4 || > 1.4.99" } -} \ No newline at end of file +} From cc34832c6d7506f7f1c15c8413376ea59d0c5661 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 09:16:06 +0100 Subject: [PATCH 07/21] Update composer. --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index b31cd11..6ce1764 100644 --- a/composer.json +++ b/composer.json @@ -46,3 +46,4 @@ "pimcore/workflow-designer": "<1.4 || > 1.4.99" } } + From 4b8bb480ba26c771a6209b51f562cecabcec0aab Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 09:24:46 +0100 Subject: [PATCH 08/21] Update composer. --- .github/workflows/osv-checks.yaml | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/osv-checks.yaml b/.github/workflows/osv-checks.yaml index 2755a38..27c8b83 100644 --- a/.github/workflows/osv-checks.yaml +++ b/.github/workflows/osv-checks.yaml @@ -24,4 +24,5 @@ jobs: with: php-version: ${{ matrix.php-version }} platform-version: ${{ matrix.platform-version }} + composer-check-only: true secrets: inherit \ No newline at end of file diff --git a/composer.json b/composer.json index 6ce1764..966050f 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "pimcore/admin-ui-classic-bundle": "<2.x-dev", "pimcore/admin-ui-classic-light-theme-bundle": "<1.0 || > 1.0.99", "pimcore/asset-metadata-class-definitions": "<2.2 || > 2.2.99", - "pimcore/backend-power-tools-bundle": "<1.2 || > 1.2.99", + "pimcore/backend-power-tools-bundle": "<1.x-dev", "pimcore/copilot-bundle": "<1.3 || > 1.3.99", "pimcore/customer-management-framework-bundle": "<4.2 || > 4.2.99", "pimcore/data-hub": "<1.9 || > 1.9.99", From 0d82897401e870198afa8ca8705c8ed677f15c91 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 09:32:28 +0100 Subject: [PATCH 09/21] Update composer. --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 966050f..8c90059 100644 --- a/composer.json +++ b/composer.json @@ -47,3 +47,4 @@ } } + From 04d166b97dcfa697bde9856c1a74da1b5468ecc2 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 09:37:38 +0100 Subject: [PATCH 10/21] Update composer. --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 8c90059..966050f 100644 --- a/composer.json +++ b/composer.json @@ -47,4 +47,3 @@ } } - From dcc555e365528100cb24ce158f5e5fc0a60ac2c2 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 09:39:50 +0100 Subject: [PATCH 11/21] Update composer. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 966050f..9284e81 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "pimcore/output-data-config-toolkit-bundle": "<5.2 || > 5.2.99", "pimcore/personalization-bundle": "<1.1 || > 1.1.99", "pimcore/perspective-editor": "<1.8 || > 1.8.99", - "pimcore/pimcore": "<12.x-dev", + "pimcore/pimcore": "<12.0", "pimcore/portal-engine": "<4.2 || > 4.2.99", "pimcore/quill-bundle": "<1.x-dev", "pimcore/static-resolver-bundle": "<1.4 || > 1.4.99", From 0b783990a35c8760f35e24a9203fd696a1edffe3 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 09:46:06 +0100 Subject: [PATCH 12/21] Update composer. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9284e81..7823551 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "pimcore/admin-ui-classic-bundle": "<2.x-dev", "pimcore/admin-ui-classic-light-theme-bundle": "<1.0 || > 1.0.99", "pimcore/asset-metadata-class-definitions": "<2.2 || > 2.2.99", - "pimcore/backend-power-tools-bundle": "<1.x-dev", + "pimcore/backend-power-tools-bundle": "<1.3", "pimcore/copilot-bundle": "<1.3 || > 1.3.99", "pimcore/customer-management-framework-bundle": "<4.2 || > 4.2.99", "pimcore/data-hub": "<1.9 || > 1.9.99", From a610deda788dc1ab08dfb749950558967fcba648 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 12:13:39 +0100 Subject: [PATCH 13/21] Update composer. --- composer.json | 70 ++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/composer.json b/composer.json index 7823551..98d8626 100644 --- a/composer.json +++ b/composer.json @@ -3,47 +3,43 @@ "type": "library", "description": "Verified Pimcore Version", "license": "GPL-3.0-or-later", - "require": { - "php": "~8.3.0 || ~8.4.0" - }, "conflict": { "pimcore/admin-ui-classic-bundle": "<2.x-dev", - "pimcore/admin-ui-classic-light-theme-bundle": "<1.0 || > 1.0.99", - "pimcore/asset-metadata-class-definitions": "<2.2 || > 2.2.99", - "pimcore/backend-power-tools-bundle": "<1.3", - "pimcore/copilot-bundle": "<1.3 || > 1.3.99", - "pimcore/customer-management-framework-bundle": "<4.2 || > 4.2.99", - "pimcore/data-hub": "<1.9 || > 1.9.99", - "pimcore/data-hub-file-export": "<2.2 || > 2.2.99", - "pimcore/data-hub-productsup": "<2.2 || > 2.2.99", - "pimcore/data-hub-simple-rest": "<3.1 || > 3.1.99", - "pimcore/data-hub-webhooks": "<1.3 || > 1.3.99", - "pimcore/data-importer": "<1.10 || > 1.10.99", - "pimcore/data-quality-management-bundle": "<1.2 || > 1.2.99", - "pimcore/direct-edit": "<2.1 || > 2.1.99", - "pimcore/ecommerce-framework-bundle": "<1.3 || > 1.3.99", + "pimcore/admin-ui-classic-light-theme-bundle": "<1.x-dev", + "pimcore/asset-metadata-class-definitions": "<3.x-dev", + "pimcore/backend-power-tools-bundle": "<1.x-dev", + "pimcore/copilot-bundle": "<2.x-dev", + "pimcore/customer-management-framework-bundle": "<4.x-dev", + "pimcore/data-hub": "<1.x-dev", + "pimcore/data-hub-file-export": "<2.x-dev", + "pimcore/data-hub-productsup": "<2.x-dev", + "pimcore/data-hub-simple-rest": "<3.x-dev", + "pimcore/data-hub-webhooks": "<1.x-dev", + "pimcore/data-importer": "<1.x-dev", + "pimcore/data-quality-management-bundle": "<1.x-dev", + "pimcore/direct-edit": "<2.x-dev", + "pimcore/ecommerce-framework-bundle": "<2.x-dev", "pimcore/file-explorer-bundle": "<1.x-dev", - "pimcore/frontend-permission-toolkit-bundle": "<2.0 || > 2.0.99", - "pimcore/generic-data-index-bundle": "<1.3 || > 1.3.99", - "pimcore/google-marketing-bundle": "<1.1 || > 1.1.99", - "pimcore/headless-documents": "<2.3 || > 2.3.99", - "pimcore/newsletter-bundle": "<1.2 || > 1.2.99", - "pimcore/object-merger": "<4.1 || > 4.1.99", + "pimcore/frontend-permission-toolkit-bundle": "<2.x-dev", + "pimcore/generic-data-index-bundle": "<2.x-dev", + "pimcore/google-marketing-bundle": "<1.x-dev", + "pimcore/headless-documents": "<2.x-dev", + "pimcore/newsletter-bundle": "<1.x-dev", + "pimcore/object-merger": "<4.x-dev", "pimcore/openid-connect": "<1.x-dev", - "pimcore/output-data-config-toolkit-bundle": "<5.2 || > 5.2.99", - "pimcore/personalization-bundle": "<1.1 || > 1.1.99", - "pimcore/perspective-editor": "<1.8 || > 1.8.99", - "pimcore/pimcore": "<12.0", - "pimcore/portal-engine": "<4.2 || > 4.2.99", + "pimcore/output-data-config-toolkit-bundle": "<5.x-dev", + "pimcore/personalization-bundle": "<1.x-dev", + "pimcore/perspective-editor": "<1.x-dev", + "pimcore/pimcore": "<12.x.dev", + "pimcore/portal-engine": "<5.x-dev", "pimcore/quill-bundle": "<1.x-dev", - "pimcore/static-resolver-bundle": "<1.4 || > 1.4.99", - "pimcore/statistics-explorer": "<2.2 || > 2.2.99", - "pimcore/system-info-bundle": "<1.0 || > 1.0.99", - "pimcore/translations-provider-interfaces": "<3.1 || > 3.1.99", - "pimcore/web-to-print-bundle": "<1.4 || > 1.4.99", - "pimcore/web2print-tools-bundle": "<5.2 || > 5.2.99", - "pimcore/workflow-automation-integration-bundle": "<1.0 || > 1.0.99", - "pimcore/workflow-designer": "<1.4 || > 1.4.99" + "pimcore/static-resolver-bundle": "<2.x-dev", + "pimcore/statistics-explorer": "<2.x-dev", + "pimcore/system-info-bundle": "<1.x-dev", + "pimcore/translations-provider-interfaces": "<4.x-dev", + "pimcore/web-to-print-bundle": "<1.x-dev", + "pimcore/web2print-tools-bundle": "<5.x-dev", + "pimcore/workflow-automation-integration-bundle": "<1.x-dev", + "pimcore/workflow-designer": "<1.x-dev" } } - From 4cdd24af5327c6b4607a75336c11ce428b5e6cf0 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 12:18:45 +0100 Subject: [PATCH 14/21] Update composer. --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 98d8626..1a18558 100644 --- a/composer.json +++ b/composer.json @@ -43,3 +43,4 @@ "pimcore/workflow-designer": "<1.x-dev" } } + From 1fca558fb8d4c2c0122d239b97e55a71eb8855fe Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 15:07:11 +0100 Subject: [PATCH 15/21] Update composer. --- .github/workflows/osv-checks.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/osv-checks.yaml b/.github/workflows/osv-checks.yaml index 27c8b83..2755a38 100644 --- a/.github/workflows/osv-checks.yaml +++ b/.github/workflows/osv-checks.yaml @@ -24,5 +24,4 @@ jobs: with: php-version: ${{ matrix.php-version }} platform-version: ${{ matrix.platform-version }} - composer-check-only: true secrets: inherit \ No newline at end of file From 7248856c3f662088ee110ab5fd70b900411e5394 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 15:30:40 +0100 Subject: [PATCH 16/21] Update composer. --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 1a18558..98d8626 100644 --- a/composer.json +++ b/composer.json @@ -43,4 +43,3 @@ "pimcore/workflow-designer": "<1.x-dev" } } - From b798d7da448be776a946dd167563e13b0c63a47a Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 15:34:57 +0100 Subject: [PATCH 17/21] Update composer. --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 98d8626..1a18558 100644 --- a/composer.json +++ b/composer.json @@ -43,3 +43,4 @@ "pimcore/workflow-designer": "<1.x-dev" } } + From d0ce090105b6fb0f4378a08bf7f5b6beb5284f9d Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 15:42:29 +0100 Subject: [PATCH 18/21] Update composer. --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 1a18558..a936dd3 100644 --- a/composer.json +++ b/composer.json @@ -44,3 +44,4 @@ } } + From f3d93faba5376d200277a95dded7468d2c551e1e Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 15:45:28 +0100 Subject: [PATCH 19/21] Update composer. --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index a936dd3..1a18558 100644 --- a/composer.json +++ b/composer.json @@ -44,4 +44,3 @@ } } - From 46ce09ca2c6134d082a1f11ac17ca56e9be5e439 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 15:48:58 +0100 Subject: [PATCH 20/21] Update composer. --- .github/workflows/osv-checks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/osv-checks.yaml b/.github/workflows/osv-checks.yaml index 2755a38..af4b9ce 100644 --- a/.github/workflows/osv-checks.yaml +++ b/.github/workflows/osv-checks.yaml @@ -20,7 +20,7 @@ jobs: # - { php-version: 8.1, platform-version: 'v2022.0' } # - { php-version: 8.2, platform-version: 'v2023.3' } # - { php-version: 8.3, platform-version: 'v2024.4' } - - { php-version: 8.4, platform-version: '2025.x' } + - { php-version: 8.4, platform-version: 'update-2025.x-to-php-8.4' } with: php-version: ${{ matrix.php-version }} platform-version: ${{ matrix.platform-version }} From 43b6a26eeb6e11d8ac3d10d39f2a21d765464d18 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Wed, 22 Jan 2025 15:59:11 +0100 Subject: [PATCH 21/21] Update composer. --- .github/workflows/osv-checks.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/osv-checks.yaml b/.github/workflows/osv-checks.yaml index af4b9ce..67b7174 100644 --- a/.github/workflows/osv-checks.yaml +++ b/.github/workflows/osv-checks.yaml @@ -17,10 +17,10 @@ jobs: fail-fast: false matrix: include: - # - { php-version: 8.1, platform-version: 'v2022.0' } - # - { php-version: 8.2, platform-version: 'v2023.3' } - # - { php-version: 8.3, platform-version: 'v2024.4' } - - { php-version: 8.4, platform-version: 'update-2025.x-to-php-8.4' } + - { php-version: 8.1, platform-version: 'v2022.0' } + - { php-version: 8.2, platform-version: 'v2023.3' } + - { php-version: 8.3, platform-version: 'v2024.4' } + - { php-version: 8.4, platform-version: '2025.x' } with: php-version: ${{ matrix.php-version }} platform-version: ${{ matrix.platform-version }}