From 36261af5f6a5058e3aee6ef18f9b59286a0c01d0 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 | 9 +++++++-- composer.json | 7 ++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6da94f8..e7ff7b0 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 }}" diff --git a/composer.json b/composer.json index 9ccc17e..a8992dc 100644 --- a/composer.json +++ b/composer.json @@ -8,11 +8,12 @@ ], "license": "MIT", "conflict": { - "twig/twig": "<2.9" + "sylius/sylius": "2.0.0", + "sylius/state-machine-abstraction": "*" }, "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", @@ -36,7 +37,7 @@ "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": {