From ad56f56f938133365004f159288dfa75179e3452 Mon Sep 17 00:00:00 2001 From: Jeroen Thora Date: Sun, 14 Mar 2021 16:59:24 +0100 Subject: [PATCH] [AdminListBundle] Change pagerfanta dependencies to require the minimum needed packages --- UPGRADE-5.8.md | 10 ++++++++++ composer.json | 2 +- .../AbstractDoctrineORMAdminListConfigurator.php | 4 ++-- src/Kunstmaan/AdminListBundle/composer.json | 5 ++++- src/Kunstmaan/ArticleBundle/composer.json | 4 +++- src/Kunstmaan/MediaBundle/composer.json | 3 ++- src/Kunstmaan/NodeSearchBundle/composer.json | 4 +++- 7 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 UPGRADE-5.8.md diff --git a/UPGRADE-5.8.md b/UPGRADE-5.8.md new file mode 100644 index 0000000000..cced6e48bb --- /dev/null +++ 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 index 9949d6f5ad..06d452e1f2 100644 --- 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.4", "kunstmaan/google-api-custom": "~1.0", "gedmo/doctrine-extensions": "^2.4.34", "doctrine/doctrine-fixtures-bundle": "^3.3", diff --git a/src/Kunstmaan/AdminListBundle/AdminList/Configurator/AbstractDoctrineORMAdminListConfigurator.php b/src/Kunstmaan/AdminListBundle/AdminList/Configurator/AbstractDoctrineORMAdminListConfigurator.php index 4fa1f3bb28..9f1dba5d86 100644 --- a/src/Kunstmaan/AdminListBundle/AdminList/Configurator/AbstractDoctrineORMAdminListConfigurator.php +++ b/src/Kunstmaan/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/composer.json b/src/Kunstmaan/AdminListBundle/composer.json index 175d4b6210..2474f342fa 100644 --- 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 index 213e269585..28f72cfaed 100644 --- 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 index b4b2dc7de4..4c6f424972 100644 --- 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 index b913faff50..8a50e07718 100644 --- 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",