From 5596ceff7afd910489d321cd3976ce3b7a4878ff Mon Sep 17 00:00:00 2001 From: Stefan Doorn Date: Wed, 18 Dec 2024 13:52:17 +0100 Subject: [PATCH] Support Sylius 2.0 --- .github/workflows/build.yml | 14 ++++++++++++-- composer.json | 5 ++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6da94f8..5730348 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,10 +23,15 @@ jobs: matrix: php: ["8.1", "8.2", "8.3"] symfony: ["^5.4", "^6.4"] - sylius: ["~1.13.0", "~1.14.0"] + sylius: ["~1.13.0", "~1.14.0", "~2.0.0"] node: ["14.x"] mysql: ["8.0"] - + exclude: + - php: "8.1" + sylius: "~2.0.0" + - symfony: "^5.4" + sylius: "~2.0.0" + env: APP_ENV: test DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}" @@ -103,6 +108,11 @@ jobs: if: matrix.symfony != '^6.4' run: composer require sensiolabs/security-checker:^6.0 --no-update --no-scripts --no-interaction + - + name: Add sylius/state-machine-abstraction + if: matrix.sylius != '~2.0.0' + run: composer require sylius/state-machine-abstraction:^1.0 --dev --no-update --no-scripts --no-interaction + - name: Install PHP dependencies run: composer install --no-interaction diff --git a/composer.json b/composer.json index 9ccc17e..4db4c16 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ }, "require": { "php": "^7.4 || ^8.1", - "sylius/sylius": "~1.9.0 || ~1.10.0 || ~1.11.0 || ~1.12.0 || ~1.13.0 || ~1.14.0" + "sylius/sylius": "~1.9.0 || ~1.10.0 || ~1.11.0 || ~1.12.0 || ~1.13.0 || ~1.14.0 || ~2.0.0" }, "require-dev": { "api-platform/core": "~2.5.0 || ~2.6.0 || ~2.7.0", @@ -29,14 +29,13 @@ "phpunit/phpunit": "^9.5", "sylius-labs/coding-standard": "^4.0", "sylius/calendar": "^0.5.0", - "sylius/state-machine-abstraction": "^1.0", "symfony/browser-kit": "^4.4 || ^5.4 || ^6.4", "symfony/debug-bundle": "^4.4 || ^5.4 || ^6.4", "symfony/dotenv": "^4.4 || ^5.4 || ^6.4", "symfony/intl": "^4.4 || ^5.4 || ^6.4", "symfony/runtime": "^4.4 || ^5.4 || ^6.4 || ^7.0", "symfony/web-profiler-bundle": "^4.4 || ^5.4 || ^6.4", - "symfony/webpack-encore-bundle": "^1.15", + "symfony/webpack-encore-bundle": "^1.15 || ^2.2", "vimeo/psalm": "4.23.0" }, "config": {