Allow use with Pagerfanta 3.0

Sylius · Mar 19, 2021 · 7478405 · 7478405
1 parent 0bb5ab5
commit 7478405
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,10 +33,12 @@ jobs:
                         composer-flags: --ignore-platform-req=php
                     -
                         php: 7.4
+                        pagerfanta-bundle: ^2.5
                         symfony: ^4.4
                         twig: ^2.12
                     -
                         php: 7.4
+                        pagerfanta-bundle: ^3.0
                         symfony: ^5.2
                         twig: ^3.0
 
@@ -59,6 +61,11 @@ jobs:
                     composer config extra.symfony.require "${{ matrix.symfony }}"
                     (cd src/Component && composer config extra.symfony.require "${{ matrix.symfony }}")
 
+            -
+                name: Restrict babdev/pagerfanta-bundle version
+                if: matrix.pagerfanta-bundle != ''
+                run: composer require "babdev/pagerfanta-bundle:${{ matrix.pagerfanta-bundle }}" --no-update --no-scripts
+
             -
                 name: Restrict twig/twig version
                 if: matrix.twig != ''

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "babdev/pagerfanta-bundle": "^2.5",
+        "babdev/pagerfanta-bundle": "^2.5 || ^3.0",
         "doctrine/collections": "^1.6",
         "doctrine/doctrine-bundle": "^1.12 || ^2.0",
         "doctrine/event-manager": "^1.1",
@@ -56,6 +56,7 @@
         "doctrine/orm": "^2.5",
         "lchrusciel/api-test-case": "^5.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.2.1",
+        "pagerfanta/pagerfanta": "^2.4 || ^3.0",
         "pamil/phpspec-skip-example-extension": "^4.2",
         "phpspec/phpspec": "^7.0",
         "phpspec/prophecy-phpunit": "^2.0",

diff --git a/src/Bundle/Tests/DependencyInjection/Compiler/PagerfantaBridgePassTest.php b/src/Bundle/Tests/DependencyInjection/Compiler/PagerfantaBridgePassTest.php
@@ -13,8 +13,8 @@
 
 namespace Sylius\Bundle\ResourceBundle\Tests\DependencyInjection\Compiler;
 
-use BabDev\PagerfantaBundle\Twig\PagerfantaExtension;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
+use Pagerfanta\Twig\Extension\PagerfantaExtension;
 use Pagerfanta\View\ViewFactory;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Compiler\PagerfantaBridgePass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

diff --git a/src/Component/composer.json b/src/Component/composer.json
@@ -31,7 +31,7 @@
         "doctrine/collections": "^1.6",
         "doctrine/inflector": "^1.4 || ^2.0",
         "gedmo/doctrine-extensions": "^2.4",
-        "pagerfanta/core": "^2.4",
+        "pagerfanta/core": "^2.4 || ^3.0",
         "symfony/event-dispatcher": "^4.4 || ^5.2",
         "symfony/property-access": "^4.4 || ^5.2",
         "winzou/state-machine": "^0.4"