mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-02 08:11:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4490 from wallabag/dependabot/composer/babdev/pagerfanta-bundle-2.5.0

Browse source 
Bump babdev/pagerfanta-bundle from 2.4.3 to 2.5.0
This commit is contained in:
Jérémy Benoist 2020-07-29 07:35:11 +02:00 committed by GitHub
parent 90ef49ffdf c10b79e82f
commit 815c28ac38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 65 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composer.json
View file

@ -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",

97
composer.lock generated
View file

@ -4,24 +4,24 @@
"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",
"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",

2
src/Wallabag/ApiBundle/Controller/SearchRestController.php
View file

@ -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;

2
src/Wallabag/CoreBundle/Controller/EntryController.php
View file

@ -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;

2
src/Wallabag/CoreBundle/Controller/FeedController.php
View file

@ -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;

2
src/Wallabag/CoreBundle/Repository/EntryRepository.php
View file

@ -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;

2
src/Wallabag/UserBundle/Controller/ManageController.php
View file

@ -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;