From 19ff6d36c63d0e2df8ef521994f795c08b44938e Mon Sep 17 00:00:00 2001 From: Andreas Kremsler Date: Fri, 26 Apr 2024 12:34:41 +0200 Subject: [PATCH 1/4] support of sylius 1.13 --- .github/workflows/build.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59603a29..d82ab78f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: matrix: php: [8.0, 8.1] symfony: [^5.4, ^6.0] - sylius: [~1.11.0, ~1.12.0] + sylius: [~1.11.0, ~1.12.0, ~1.13.0] node: [14.x] mysql: [5.7] diff --git a/composer.json b/composer.json index 0945841b..4ada99cc 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "license": "MIT", "require": { "php": "^8.0", - "sylius/sylius": "~1.11.0 || ~1.12.0", + "sylius/sylius": "~1.11.0 || ~1.12.0 || ~1.13.0", "portphp/portphp": "^1.2", "queue-interop/queue-interop": "^0.6.2 || ^0.7 || ^0.8", "symfony/stopwatch": "^5.2 || ^6.0" From 989687367da8f4d9ea616d40a1b2849fe8e14d38 Mon Sep 17 00:00:00 2001 From: Andreas Kremsler Date: Fri, 26 Apr 2024 12:37:55 +0200 Subject: [PATCH 2/4] support of sylius 1.13 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d82ab78f..4353797f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: php: [8.0, 8.1] symfony: [^5.4, ^6.0] sylius: [~1.11.0, ~1.12.0, ~1.13.0] - node: [14.x] + node: [18.x] mysql: [5.7] exclude: From 9be7306b3a20320cb1393944d37daa4a6d92c955 Mon Sep 17 00:00:00 2001 From: Andreas Kremsler Date: Fri, 26 Apr 2024 13:02:48 +0200 Subject: [PATCH 3/4] support of sylius 1.13 --- tests/Application/config/bundles.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php index d6248e58..c1343044 100644 --- a/tests/Application/config/bundles.php +++ b/tests/Application/config/bundles.php @@ -1,6 +1,6 @@ ['all' => true], @@ -59,13 +59,17 @@ // Symplify\ConsoleColorDiff\ConsoleColorDiffBundle::class => ['dev' => true, 'test' => true] ]; -if (Kernel::MINOR_VERSION <= 11) { +if (SyliusCoreBundle::MINOR_VERSION <= 11) { $bundles[Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class] = ['all' => true]; } -if (Kernel::MINOR_VERSION >= 12) { +if (SyliusCoreBundle::MINOR_VERSION >= 12) { $bundles[League\FlysystemBundle\FlysystemBundle::class] = ['all' => true]; $bundles[Sylius\Calendar\SyliusCalendarBundle::class ] = ['all' => true]; } +if (SyliusCoreBundle::MINOR_VERSION >= 13) { + $bundles[Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class ] = ['all' => true]; +} + return $bundles; From 11d38641c41c4582c0289546d703dc3ea16c45c7 Mon Sep 17 00:00:00 2001 From: Andreas Kremsler Date: Fri, 26 Apr 2024 14:12:04 +0200 Subject: [PATCH 4/4] support of sylius 1.13 --- tests/Application/config/bundles.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php index c1343044..f7f6c32f 100644 --- a/tests/Application/config/bundles.php +++ b/tests/Application/config/bundles.php @@ -1,6 +1,6 @@ ['all' => true], @@ -59,16 +59,16 @@ // Symplify\ConsoleColorDiff\ConsoleColorDiffBundle::class => ['dev' => true, 'test' => true] ]; -if (SyliusCoreBundle::MINOR_VERSION <= 11) { +if (Kernel::MINOR_VERSION <= 11) { $bundles[Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class] = ['all' => true]; } -if (SyliusCoreBundle::MINOR_VERSION >= 12) { +if (Kernel::MINOR_VERSION >= 12) { $bundles[League\FlysystemBundle\FlysystemBundle::class] = ['all' => true]; $bundles[Sylius\Calendar\SyliusCalendarBundle::class ] = ['all' => true]; } -if (SyliusCoreBundle::MINOR_VERSION >= 13) { +if (Kernel::MINOR_VERSION >= 13) { $bundles[Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class ] = ['all' => true]; }