feature #86 Symfony 5 support (pamil)

This PR was merged into the 1.8-dev branch. Discussion ---------- #Add Symfony 5.1 to the test matrix Commits ------- c68b51e Add Symfony 5.1 to the test matrix bc646e2 Requires sylius/resource-bundle:^1.7@beta
Sylius · Nov 24, 2020 · 8f98cd7 · 8f98cd7
2 parents 002b6b1 + bc646e2
commit 8f98cd7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,13 +20,18 @@ jobs:
                     -
                         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:
             -
                 uses: actions/checkout@v2

diff --git 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
@@ -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(),

diff --git a/src/Bundle/test/app/config/config.yml b/src/Bundle/test/app/config/config.yml
@@ -12,8 +12,6 @@ framework:
         resource: "%kernel.project_dir%/app/config/routing.yml"
     form: ~
     csrf_protection: true
-    templating:
-        engines: ['twig']
     default_locale: "%locale%"
     session:
         handler_id: ~