[AdminListBundle] Change pagerfanta dependencies to require the minim…

…um needed packages
Kunstmaan · Mar 15, 2021 · 4aba6ab · 4aba6ab
1 parent b4fda4c
commit 4aba6ab
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 9 deletions.
diff --git a/UPGRADE-5.8.md b/UPGRADE-5.8.md
@@ -0,0 +1,10 @@
+UPGRADE FROM 5.7 to 5.8
+=======================
+
+General
+-------
+
+If you still require the `kunstmaan/bundles-cms` package, update you `composer.json` to require `babdev/pagerfanta-bundle` 
+instead of `white-october/pagerfanta-bundle`. All specific bundle packages that use pagerfanta functionality are now requiring 
+the specifc pagerfanta packages. Newer skeleton installs will require the correct pagerfanta bundle package but old projects 
+or projects using the `white-october` package are encouraged to switch their dependencies.
diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
         "friendsofsymfony/user-bundle": "^2.0",
         "knplabs/knp-menu-bundle": "^3.0",
         "guzzlehttp/guzzle": "~6.1",
-        "white-october/pagerfanta-bundle": "~1.0",
+        "babdev/pagerfanta-bundle": "^2.5",
         "kunstmaan/google-api-custom": "~1.0",
         "gedmo/doctrine-extensions": "^2.4.34",
         "doctrine/doctrine-fixtures-bundle": "^3.3",

diff --git a/src/Kunstmaan/AdminBundle/composer.json b/src/Kunstmaan/AdminBundle/composer.json
@@ -14,6 +14,7 @@
     ],
     "require": {
         "php": "^7.2",
+        "babdev/pagerfanta-bundle": "^2.5",
         "doctrine/orm": "^2.5",
         "doctrine/dbal": "^2.5",
         "doctrine/doctrine-bundle": "^1.6.12|^2.0",
@@ -52,8 +53,7 @@
         "symfony/yaml": "^3.4|^4.4",
         "twig/twig": "^1.40|^2.9",
         "twig/extensions": "~1.0",
-        "sensio/framework-extra-bundle": "^5.0",
-        "white-october/pagerfanta-bundle": "~1.0"
+        "sensio/framework-extra-bundle": "^5.0"
     },
     "suggest": {
         "kunstmaan/translator-bundle": "^5.2",

diff --git a/...tmaan/AdminListBundle/AdminList/Configurator/AbstractDoctrineORMAdminListConfigurator.php b/...tmaan/AdminListBundle/AdminList/Configurator/AbstractDoctrineORMAdminListConfigurator.php
@@ -10,7 +10,7 @@
 use Kunstmaan\AdminListBundle\AdminList\Filter;
 use Kunstmaan\AdminListBundle\AdminList\FilterType\ORM\AbstractORMFilterType;
 use Kunstmaan\AdminListBundle\AdminList\SortableInterface;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Doctrine\ORM\QueryAdapter as OrmQueryAdapter;
 use Pagerfanta\Pagerfanta;
 use Traversable;
 
@@ -92,7 +92,7 @@ public function getDeleteUrlFor($item)
     public function getPagerfanta()
     {
         if (\is_null($this->pagerfanta)) {
-            $adapter = new DoctrineORMAdapter($this->getQuery());
+            $adapter = new OrmQueryAdapter($this->getQuery());
             $this->pagerfanta = new Pagerfanta($adapter);
             $this->pagerfanta->setNormalizeOutOfRangePages(true);
             $this->pagerfanta->setMaxPerPage($this->getLimit());

diff --git a/src/Kunstmaan/AdminListBundle/Tests/AdminList/Helper/DoctrineDBALAdapterTest.php b/src/Kunstmaan/AdminListBundle/Tests/AdminList/Helper/DoctrineDBALAdapterTest.php
@@ -9,6 +9,11 @@
 
 class DoctrineDBALAdapterTest extends TestCase
 {
+    /**
+     * Mark test as legacy to avoid "\Pagerfanta\Exception\Exception" interface deprecation
+     *
+     * @group legacy
+     */
     public function testConstructorWithIncorrectCountField()
     {
         $this->expectExceptionMessage('The $countField must contain a table alias in the string.');

diff --git a/src/Kunstmaan/AdminListBundle/composer.json b/src/Kunstmaan/AdminListBundle/composer.json
@@ -14,8 +14,11 @@
     ],
     "require": {
         "php": "^7.2",
+        "box/spout": "^2.5",
         "kunstmaan/admin-bundle": "^5.7",
-        "box/spout": "^2.5"
+        "pagerfanta/core": "^2.4",
+        "pagerfanta/doctrine-orm-adapter": "^2.4",
+        "pagerfanta/twig": "^2.4"
     },
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^4.0",

diff --git a/src/Kunstmaan/ArticleBundle/composer.json b/src/Kunstmaan/ArticleBundle/composer.json
@@ -15,7 +15,9 @@
     "require": {
         "php": "^7.2",
         "kunstmaan/adminlist-bundle": "^5.2",
-        "kunstmaan/pagepart-bundle": "^5.2"
+        "kunstmaan/pagepart-bundle": "^5.2",
+        "pagerfanta/core": "^2.4",
+        "pagerfanta/twig": "^2.4"
     },
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^4.0",

diff --git a/src/Kunstmaan/MediaBundle/composer.json b/src/Kunstmaan/MediaBundle/composer.json
@@ -20,7 +20,8 @@
         "symfony/mime": "^4.4",
         "imagine/imagine": "~0.6",
         "knplabs/knp-gaufrette-bundle": "~0.1",
-        "kunstmaan/adminlist-bundle": "~5.2"
+        "kunstmaan/adminlist-bundle": "~5.2",
+        "pagerfanta/twig": "^2.4"
     },
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^4.0",

diff --git a/src/Kunstmaan/NodeSearchBundle/composer.json b/src/Kunstmaan/NodeSearchBundle/composer.json
@@ -22,7 +22,9 @@
         "php": "^7.2",
         "kunstmaan/admin-bundle": "^5.7",
         "kunstmaan/pagepart-bundle": "~5.2",
-        "kunstmaan/search-bundle": "~5.2"
+        "kunstmaan/search-bundle": "~5.2",
+        "pagerfanta/core": "^2.4",
+        "pagerfanta/twig": "^2.4"
     },
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^4.0",