From 26d7ce2edc0622028fc75555f8477a745a36e727 Mon Sep 17 00:00:00 2001 From: Christian Fasching Date: Tue, 2 Jul 2024 15:53:20 +0200 Subject: [PATCH] Add platform-version (#578) * add platform-version * Update composer.json * Update pimcore-demo.yml * Update composer.json * apply alias changes --------- Co-authored-by: JiaJia Ji --- .github/workflows/pimcore-demo.yml | 9 +++++---- README.md | 9 +++++++++ composer.json | 17 +++++++++-------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pimcore-demo.yml b/.github/workflows/pimcore-demo.yml index 08712e81..21d7caaa 100644 --- a/.github/workflows/pimcore-demo.yml +++ b/.github/workflows/pimcore-demo.yml @@ -20,10 +20,10 @@ jobs: strategy: matrix: include: - - { php-version: 8.2, database: "mariadb:10.11", pimcore_version: "", experimental: true } - - { php-version: 8.2, database: "mariadb:10.11", pimcore_version: "", pimcore_upgrade_version: "11.x-dev as 11.0.0", experimental: true } - - { php-version: 8.2, database: "mysql:latest", pimcore_version: "", experimental: true } - - { php-version: 8.2, database: "mysql:latest", pimcore_version: "", pimcore_upgrade_version: "11.x-dev as 11.0.0", experimental: true } + - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "", experimental: true } + - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "", pimcore_upgrade_version: "11.x-dev as 11.3.99", experimental: true } + - { php-version: 8.3, database: "mysql:latest", pimcore_version: "", experimental: true } + - { php-version: 8.3, database: "mysql:latest", pimcore_version: "", pimcore_upgrade_version: "11.x-dev as 11.3.99", experimental: true } steps: # Check out the repo in a sub-dir to see if it can serve as # template for `composer create-project` @@ -134,6 +134,7 @@ jobs: set -ex cd sample-project/ + docker-compose exec -T -- php composer remove pimcore/platform-version --no-update docker-compose exec -T -- php composer require pimcore/pimcore:"${UPGRADE_VERSION}" # Run pimcore migration. diff --git a/README.md b/README.md index f27c75c3..8ad6b691 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,15 @@ You don't need to have a PHP environment with composer installed. * The admin interface, using the credentials you have chosen above: +## Pimcore Platform Version +By default, Pimcore Platform Version is added as a dependency which ensures installation of compatible and in combination +with each other tested versions of additional Pimcore modules. More information about the Platform Version can be found in the +[Platform Version docs](https://github.com/pimcore/platform-version). + +It might be necessary to update a specific Pimcore module to a version that is not included in the Platform Version. +In that case, you need to remove the `platform-version` dependency from your `composer.json` and update the module to +the desired version. +Be aware that this might lead to a theoretically compatible but untested combination of Pimcore modules. ## Other demo/skeleton packages - [Pimcore Skeleton](https://github.com/pimcore/skeleton/) diff --git a/composer.json b/composer.json index 787a0406..1b753164 100644 --- a/composer.json +++ b/composer.json @@ -18,15 +18,16 @@ "require": { "php-http/guzzle7-adapter": "^0.1.1", "php-http/httplug-bundle": "^1", - "pimcore/customer-management-framework-bundle": "^4.0", - "pimcore/pimcore": "^11.1", - "pimcore/web2print-tools-bundle": "^5.0", - "pimcore/data-hub": "^1.6", + "pimcore/platform-version": "^2024.2", + "pimcore/customer-management-framework-bundle": "*", + "pimcore/pimcore": "*", + "pimcore/web2print-tools-bundle": "*", + "pimcore/data-hub": "*", "pimcore/payment-provider-paypal-smart-payment-button": "^2.0", - "pimcore/admin-ui-classic-bundle": "^1.2", - "pimcore/ecommerce-framework-bundle": "^1.0", - "pimcore/web-to-print-bundle": "^1.0", - "pimcore/newsletter-bundle": "^1.0", + "pimcore/admin-ui-classic-bundle": "*", + "pimcore/ecommerce-framework-bundle": "*", + "pimcore/web-to-print-bundle": "*", + "pimcore/newsletter-bundle": "*", "symfony/runtime": "^6.2", "symfony/intl": "^6.2", "symfony/dotenv": "^6.2",