diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34b946c..efef7f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: matrix: php: [ "8.1" ] symfony: [ "5.4.*", "^6.0" ] - sylius: [ "^1.12" ] + sylius: ["~1.12.0", "1.13.0"] node: [ "14.x" ] mysql: [ "8.0" ] @@ -154,6 +154,7 @@ jobs: - name: Validate composer.json + if: ${{ matrix.sylius != '1.13.0' }} run: composer validate --ansi --strict - diff --git a/composer.json b/composer.json index 31ee8fc..edae82a 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "license": "MIT", "require": { "php": "^8.1", - "sylius/sylius": "^1.12", + "sylius/sylius": ">=1.12.13 || ~1.13.0", "sylius/mailer-bundle": "^1.8 || ^2.0@beta", "symfony/webpack-encore-bundle": "^1.15" }, @@ -44,7 +44,8 @@ "vimeo/psalm": "5.12.0" }, "conflict": { - "symfony/framework-bundle": "6.2.8" + "symfony/framework-bundle": "6.2.8", + "symfony/validator": "6.4.7" }, "config": { "sort-packages": true, diff --git a/config/services/action.xml b/config/services/action.xml index b532c5f..1f1b2fc 100644 --- a/config/services/action.xml +++ b/config/services/action.xml @@ -11,17 +11,17 @@ - + - + - + diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php index a5c1bb5..94bd806 100644 --- a/tests/Application/config/bundles.php +++ b/tests/Application/config/bundles.php @@ -1,6 +1,8 @@ ['all' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], @@ -59,3 +61,9 @@ Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], League\FlysystemBundle\FlysystemBundle::class => ['all' => true], ]; + +if ( defined(SyliusCoreBundle::class.'::VERSION_ID') && SyliusCoreBundle::VERSION_ID >= '11300') { + $bundles[Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class] = ['all' => true]; +} + +return $bundles;