From a467a4e502c874d93ef011690efcf970a46ff35f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 03:03:28 +0000 Subject: [PATCH 1/2] Bump babdev/pagerfanta-bundle from 2.4.3 to 2.5.0 Bumps [babdev/pagerfanta-bundle](https://github.com/BabDev/BabDevPagerfantaBundle) from 2.4.3 to 2.5.0. - [Release notes](https://github.com/BabDev/BabDevPagerfantaBundle/releases) - [Changelog](https://github.com/BabDev/PagerfantaBundle/blob/2.x/CHANGELOG.md) - [Commits](https://github.com/BabDev/BabDevPagerfantaBundle/compare/v2.4.3...v2.5.0) Signed-off-by: dependabot-preview[bot] --- composer.lock | 95 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/composer.lock b/composer.lock index 157c2b24b..b5826d3b1 100644 --- a/composer.lock +++ b/composer.lock @@ -8,20 +8,20 @@ "packages": [ { "name": "babdev/pagerfanta-bundle", - "version": "v2.4.3", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/BabDev/PagerfantaBundle.git", - "reference": "602f4847b27d72364b49b31d15dfc02a59aaece8" + "reference": "3eaedef12af657238dfd9307b8892481916cb655" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BabDev/PagerfantaBundle/zipball/602f4847b27d72364b49b31d15dfc02a59aaece8", - "reference": "602f4847b27d72364b49b31d15dfc02a59aaece8", + "url": "https://api.github.com/repos/BabDev/PagerfantaBundle/zipball/3eaedef12af657238dfd9307b8892481916cb655", + "reference": "3eaedef12af657238dfd9307b8892481916cb655", "shasum": "" }, "require": { - "pagerfanta/pagerfanta": "^2.2.1", + "pagerfanta/pagerfanta": "^2.4", "php": "^7.2", "symfony/config": "^3.4 || ^4.4 || ^5.0", "symfony/dependency-injection": "^3.4 || ^4.4 || ^5.0", @@ -32,28 +32,28 @@ "symfony/routing": "^3.4 || ^4.4 || ^5.0" }, "conflict": { - "twig/twig": "<1.34 || >=2.0,<2.4", + "twig/twig": "<1.35 || >=2.0,<2.5", "white-october/pagerfanta-bundle": "*" }, "require-dev": { "doctrine/annotations": "^1.8", "friendsofphp/php-cs-fixer": "^2.16", "matthiasnoback/symfony-dependency-injection-test": "^4.1", + "phpstan/extension-installer": "^1.0.3", + "phpstan/phpstan": "^0.12.33", + "phpstan/phpstan-phpunit": "^0.12.13", + "phpstan/phpstan-symfony": "^0.12.7", "phpunit/phpunit": "^8.5 || ^9.0", "symfony/translation": "^3.4 || ^4.4 || ^5.0", "symfony/twig-bridge": "^3.4 || ^4.4 || ^5.0", - "twig/twig": "^1.34 || ^2.4 || ^3.0" + "symfony/twig-bundle": "^3.4 || ^4.4 || ^5.0", + "twig/twig": "^1.35 || ^2.5 || ^3.0" }, "suggest": { "symfony/translation": "To use the Pagerfanta views with translation support", "twig/twig": "To integrate Pagerfanta with Twig through extensions" }, "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - } - }, "autoload": { "psr-4": { "BabDev\\PagerfantaBundle\\": "" @@ -78,7 +78,7 @@ "type": "github" } ], - "time": "2020-06-30T14:02:17+00:00" + "time": "2020-07-25T21:24:07+00:00" }, { "name": "bdunogier/guzzle-site-authenticator", @@ -5704,16 +5704,16 @@ }, { "name": "pagerfanta/pagerfanta", - "version": "v2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/BabDev/Pagerfanta.git", - "reference": "fd00eb74632fecc0265327e9fe0eddc08c72b238" + "reference": "43ab8ba41c382f35ca6fae3ccb8d19eb01e8d266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BabDev/Pagerfanta/zipball/fd00eb74632fecc0265327e9fe0eddc08c72b238", - "reference": "fd00eb74632fecc0265327e9fe0eddc08c72b238", + "url": "https://api.github.com/repos/BabDev/Pagerfanta/zipball/43ab8ba41c382f35ca6fae3ccb8d19eb01e8d266", + "reference": "43ab8ba41c382f35ca6fae3ccb8d19eb01e8d266", "shasum": "" }, "require": { @@ -5721,6 +5721,20 @@ "php": "^7.2", "symfony/deprecation-contracts": "^2.1" }, + "conflict": { + "twig/twig": "<1.35 || >=2.0,<2.5" + }, + "replace": { + "pagerfanta/core": "self.version", + "pagerfanta/doctrine-collections-adapter": "self.version", + "pagerfanta/doctrine-dbal-adapter": "self.version", + "pagerfanta/doctrine-mongodb-odm-adapter": "self.version", + "pagerfanta/doctrine-orm-adapter": "self.version", + "pagerfanta/doctrine-phpcr-odm-adapter": "self.version", + "pagerfanta/elastica-adapter": "self.version", + "pagerfanta/solarium-adapter": "self.version", + "pagerfanta/twig": "self.version" + }, "require-dev": { "doctrine/collections": "^1.4", "doctrine/dbal": "^2.5", @@ -5729,29 +5743,32 @@ "friendsofphp/php-cs-fixer": "^2.16.3", "jackalope/jackalope-doctrine-dbal": "^1.3", "mandango/mandango": "^1.0@dev", + "phpstan/extension-installer": "^1.0.4", + "phpstan/phpstan": "^0.12.33", + "phpstan/phpstan-phpunit": "^0.12.12", "phpunit/phpunit": "^8.5 || ^9.0", "propel/propel": "^2.0@dev", "propel/propel1": "^1.7", - "ruflin/elastica": "^1.3 || ^2.0 || ^3.0 || ^5.0 || ^6.0", - "solarium/solarium": "^2.3 || ^3.0 || ^4.0 || ^5.0" + "ruflin/elastica": "^1.3 || ^2.0 || ^3.0 || ^5.0 || ^6.0 || ^7.0", + "solarium/solarium": "^2.3 || ^3.0 || ^4.0 || ^5.0", + "twig/twig": "^1.35 || ^2.5 || ^3.0" }, "suggest": { - "doctrine/collections": "To use the Doctrine Collection and Selectable adapter.", - "doctrine/dbal": "To use the Doctrine DBAL adapters.", - "doctrine/mongodb-odm": "To use the Doctrine MongoDB ODM Adapter.", - "doctrine/orm": "To use the Doctrine ORM Adapter.", - "doctrine/phpcr-odm": "To use the Doctrine PHPCR ODM Adapter.", - "solarium/solarium": "To use the SolariumAdapter." + "twig/twig": "To integrate Pagerfanta with Twig" }, "type": "library", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - } - }, "autoload": { "psr-4": { - "Pagerfanta\\": "src/" + "Pagerfanta\\": "lib/Core/", + "Pagerfanta\\Adapter\\": "src/Adapter/", + "Pagerfanta\\Doctrine\\Collections\\": "lib/Adapter/Doctrine/Collections/", + "Pagerfanta\\Doctrine\\DBAL\\": "lib/Adapter/Doctrine/DBAL/", + "Pagerfanta\\Doctrine\\MongoDBODM\\": "lib/Adapter/Doctrine/MongoDBODM/", + "Pagerfanta\\Doctrine\\ORM\\": "lib/Adapter/Doctrine/ORM/", + "Pagerfanta\\Doctrine\\PHPCRODM\\": "lib/Adapter/Doctrine/PHPCRODM/", + "Pagerfanta\\Elastica\\": "lib/Adapter/Elastica/", + "Pagerfanta\\Solarium\\": "lib/Adapter/Solarium/", + "Pagerfanta\\Twig\\": "lib/Twig/" } }, "notification-url": "https://packagist.org/downloads/", @@ -5771,7 +5788,7 @@ "type": "github" } ], - "time": "2020-06-09T15:25:12+00:00" + "time": "2020-07-25T21:21:39+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -8326,16 +8343,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.1.2", + "version": "v2.1.3", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337" + "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337", - "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5e20b83385a77593259c9f8beb2c43cd03b2ac14", + "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14", "shasum": "" }, "require": { @@ -8345,6 +8362,10 @@ "extra": { "branch-alias": { "dev-master": "2.1-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -8382,7 +8403,7 @@ "type": "tidelift" } ], - "time": "2020-05-27T08:34:37+00:00" + "time": "2020-06-06T08:49:21+00:00" }, { "name": "symfony/http-client", From c10b79e82f93617af1bcfae9222aabcca0826822 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 29 Jul 2020 06:36:43 +0200 Subject: [PATCH 2/2] Update PagerFanta deprecation --- composer.json | 1 + composer.lock | 2 +- src/Wallabag/ApiBundle/Controller/SearchRestController.php | 2 +- src/Wallabag/CoreBundle/Controller/EntryController.php | 2 +- src/Wallabag/CoreBundle/Controller/FeedController.php | 2 +- src/Wallabag/CoreBundle/Repository/EntryRepository.php | 2 +- src/Wallabag/UserBundle/Controller/ManageController.php | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index a0d29ab48..2e56335d7 100644 --- a/composer.json +++ b/composer.json @@ -77,6 +77,7 @@ "nelmio/api-doc-bundle": "^2.13.2", "nelmio/cors-bundle": "~1.5", "ocramius/proxy-manager": "^2.1.1", + "pagerfanta/doctrine-orm-adapter": "^2.4", "php-amqplib/rabbitmq-bundle": "^1.14", "php-http/guzzle5-adapter": "^2.0", "php-http/httplug-bundle": "^1.14", diff --git a/composer.lock b/composer.lock index b5826d3b1..ac23b7d4e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2df8111ca5b34ecb7f1268404db82e27", + "content-hash": "ab0454155d2539b55816a2f16c6c61cc", "packages": [ { "name": "babdev/pagerfanta-bundle", diff --git a/src/Wallabag/ApiBundle/Controller/SearchRestController.php b/src/Wallabag/ApiBundle/Controller/SearchRestController.php index d9f99844c..7b415ea24 100644 --- a/src/Wallabag/ApiBundle/Controller/SearchRestController.php +++ b/src/Wallabag/ApiBundle/Controller/SearchRestController.php @@ -5,7 +5,7 @@ namespace Wallabag\ApiBundle\Controller; use Hateoas\Configuration\Route; use Hateoas\Representation\Factory\PagerfantaFactory; use Nelmio\ApiDocBundle\Annotation\ApiDoc; -use Pagerfanta\Adapter\DoctrineORMAdapter; +use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 9b2954e7d..db7d76a0a 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -3,7 +3,7 @@ namespace Wallabag\CoreBundle\Controller; use Doctrine\ORM\NoResultException; -use Pagerfanta\Adapter\DoctrineORMAdapter; +use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter; use Pagerfanta\Exception\OutOfRangeCurrentPageException; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; use Symfony\Bundle\FrameworkBundle\Controller\Controller; diff --git a/src/Wallabag/CoreBundle/Controller/FeedController.php b/src/Wallabag/CoreBundle/Controller/FeedController.php index 95c3427b8..fb9b24790 100644 --- a/src/Wallabag/CoreBundle/Controller/FeedController.php +++ b/src/Wallabag/CoreBundle/Controller/FeedController.php @@ -3,7 +3,7 @@ namespace Wallabag\CoreBundle\Controller; use Pagerfanta\Adapter\ArrayAdapter; -use Pagerfanta\Adapter\DoctrineORMAdapter; +use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter; use Pagerfanta\Exception\OutOfRangeCurrentPageException; use Pagerfanta\Pagerfanta; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index bfd079377..62ff3d7ef 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php @@ -5,7 +5,7 @@ namespace Wallabag\CoreBundle\Repository; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\NoResultException; use Doctrine\ORM\QueryBuilder; -use Pagerfanta\Adapter\DoctrineORMAdapter; +use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter; use Pagerfanta\Pagerfanta; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\CoreBundle\Entity\Tag; diff --git a/src/Wallabag/UserBundle/Controller/ManageController.php b/src/Wallabag/UserBundle/Controller/ManageController.php index 1122f8f07..353950667 100644 --- a/src/Wallabag/UserBundle/Controller/ManageController.php +++ b/src/Wallabag/UserBundle/Controller/ManageController.php @@ -4,7 +4,7 @@ namespace Wallabag\UserBundle\Controller; use FOS\UserBundle\Event\UserEvent; use FOS\UserBundle\FOSUserEvents; -use Pagerfanta\Adapter\DoctrineORMAdapter; +use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter; use Pagerfanta\Exception\OutOfRangeCurrentPageException; use Pagerfanta\Pagerfanta; use Symfony\Bundle\FrameworkBundle\Controller\Controller;