From b88788978c4d25fb932dd0c74c3d40b5ba6d007d Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Tue, 24 Nov 2020 16:38:54 +0100 Subject: [PATCH] Requires sylius/resource-bundle:^1.7@beta --- .github/workflows/build.yml | 17 +++++++++++++---- composer.json | 2 +- src/Bundle/test/app/AppKernel.php | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aaab6d20..907c4843 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,12 +16,21 @@ jobs: strategy: fail-fast: false matrix: - php: [7.3, 7.4] - symfony: [4.4.*, 5.1.*] - currency-bundle: ["", "^1.7"] - exclude: + include: - php: 7.3 + symfony: 4.4.* + - + php: 7.3 + symfony: 5.1.* + - + php: 7.4 + symfony: 4.4.* + - + php: 7.4 + symfony: 5.1.* + - + php: 7.4 currency-bundle: "^1.7" steps: - diff --git a/composer.json b/composer.json index bf23b6dd..f2aaaaeb 100644 --- a/composer.json +++ b/composer.json @@ -65,7 +65,7 @@ "phpstan/phpstan-webmozart-assert": "0.12.7", "phpunit/phpunit": "^9.4", "sylius-labs/coding-standard": "^3.0", - "sylius/resource-bundle": "^1.6", + "sylius/resource-bundle": "^1.7@rc", "symfony/console": "^4.4 || ^5.1", "symfony/twig-bundle": "^4.4 || ^5.1", "twig/extensions": "^1.5", diff --git a/src/Bundle/test/app/AppKernel.php b/src/Bundle/test/app/AppKernel.php index e6b73603..5b6d0ab4 100644 --- a/src/Bundle/test/app/AppKernel.php +++ b/src/Bundle/test/app/AppKernel.php @@ -26,7 +26,7 @@ public function registerBundles(): array new JMS\SerializerBundle\JMSSerializerBundle(), new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(), new Sylius\Bundle\GridBundle\SyliusGridBundle(), - new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(), + new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(), new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(), new winzou\Bundle\StateMachineBundle\winzouStateMachineBundle(), new Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle(),