From f63b70fdd35faa03019623360c4107b7e3dce00d Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 02:20:58 +0300 Subject: [PATCH] composer update knplabs/knp-paginator-bundle (v2.6.0 => v2.8.0). KNP Paginator deprecations removed. --- composer.lock | 26 +++++++++---------- .../Controller/EventsController.php | 4 +-- .../Controller/PublicFeedController.php | 4 +-- .../Controller/UserController.php | 4 +-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index cc1ecca..f753436 100644 --- a/composer.lock +++ b/composer.lock @@ -1757,32 +1757,32 @@ }, { "name": "knplabs/knp-paginator-bundle", - "version": "v2.6.0", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpPaginatorBundle.git", - "reference": "293abb6a2f1ae53ace5796d0ef3e5ae1b8f92371" + "reference": "f4ece5b347121b9fe13166264f197f90252d4bd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/293abb6a2f1ae53ace5796d0ef3e5ae1b8f92371", - "reference": "293abb6a2f1ae53ace5796d0ef3e5ae1b8f92371", + "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/f4ece5b347121b9fe13166264f197f90252d4bd2", + "reference": "f4ece5b347121b9fe13166264f197f90252d4bd2", "shasum": "" }, "require": { "knplabs/knp-components": "~1.2", "php": ">=5.3.3", - "symfony/framework-bundle": "~2.7|~3.0", + "symfony/framework-bundle": "~2.7|~3.0|~4.0", "twig/twig": "~1.12|~2" }, "require-dev": { - "phpunit/phpunit": "~4.8", - "symfony/expression-language": "~2.7|~3.0" + "phpunit/phpunit": "~4.8.35|~5.4.3|~6.4", + "symfony/expression-language": "~2.7|~3.0|~4.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.5.x-dev" + "dev-master": "2.8.x-dev" } }, "autoload": { @@ -1800,22 +1800,22 @@ "homepage": "http://knplabs.com" }, { - "name": "Symfony2 Community", + "name": "Symfony Community", "homepage": "http://github.com/KnpLabs/KnpPaginatorBundle/contributors" } ], - "description": "Paginator bundle for Symfony2 to automate pagination and simplify sorting and other features", + "description": "Paginator bundle for Symfony to automate pagination and simplify sorting and other features", "homepage": "http://github.com/KnpLabs/KnpPaginatorBundle", "keywords": [ - "Symfony2", "bundle", "knp", "knplabs", "pager", "pagination", - "paginator" + "paginator", + "symfony" ], - "time": "2017-06-09T15:25:39+00:00" + "time": "2018-05-16T12:15:58+00:00" }, { "name": "michelf/php-markdown", diff --git a/src/Skobkin/Bundle/PointToolsBundle/Controller/EventsController.php b/src/Skobkin/Bundle/PointToolsBundle/Controller/EventsController.php index c715117..0bfb9ba 100644 --- a/src/Skobkin/Bundle/PointToolsBundle/Controller/EventsController.php +++ b/src/Skobkin/Bundle/PointToolsBundle/Controller/EventsController.php @@ -2,14 +2,14 @@ namespace Skobkin\Bundle\PointToolsBundle\Controller; -use Knp\Component\Pager\Paginator; +use Knp\Component\Pager\PaginatorInterface; use Skobkin\Bundle\PointToolsBundle\Repository\SubscriptionEventRepository; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\{Request, Response}; class EventsController extends AbstractController { - public function lastAction(Request $request, SubscriptionEventRepository $eventRepository, Paginator $paginator): Response + public function lastAction(Request $request, SubscriptionEventRepository $eventRepository, PaginatorInterface $paginator): Response { $eventsPagination = $paginator->paginate( $eventRepository->createLastSubscriptionEventsQuery(), diff --git a/src/Skobkin/Bundle/PointToolsBundle/Controller/PublicFeedController.php b/src/Skobkin/Bundle/PointToolsBundle/Controller/PublicFeedController.php index 1096433..d9d7be7 100644 --- a/src/Skobkin/Bundle/PointToolsBundle/Controller/PublicFeedController.php +++ b/src/Skobkin/Bundle/PointToolsBundle/Controller/PublicFeedController.php @@ -2,7 +2,7 @@ namespace Skobkin\Bundle\PointToolsBundle\Controller; -use Knp\Component\Pager\Paginator; +use Knp\Component\Pager\PaginatorInterface; use Skobkin\Bundle\PointToolsBundle\Repository\Blogs\PostRepository; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -11,7 +11,7 @@ class PublicFeedController extends AbstractController { private const POSTS_PER_PAGE = 20; - public function indexAction(Request $request, PostRepository $postRepository, Paginator $paginator) + public function indexAction(Request $request, PostRepository $postRepository, PaginatorInterface $paginator) { $postsPagination = $paginator->paginate( $postRepository->createPublicFeedPostsQuery(), diff --git a/src/Skobkin/Bundle/PointToolsBundle/Controller/UserController.php b/src/Skobkin/Bundle/PointToolsBundle/Controller/UserController.php index 3948946..f678d58 100644 --- a/src/Skobkin/Bundle/PointToolsBundle/Controller/UserController.php +++ b/src/Skobkin/Bundle/PointToolsBundle/Controller/UserController.php @@ -2,7 +2,7 @@ namespace Skobkin\Bundle\PointToolsBundle\Controller; -use Knp\Component\Pager\Paginator; +use Knp\Component\Pager\PaginatorInterface; use Skobkin\Bundle\PointToolsBundle\DTO\{DailyEvents, TopUserDTO}; use Skobkin\Bundle\PointToolsBundle\Entity\User; use Skobkin\Bundle\PointToolsBundle\Repository\{SubscriptionEventRepository, UserRenameEventRepository, UserRepository}; @@ -30,7 +30,7 @@ class UserController extends AbstractController SubscriptionEventRepository $subscriptionEventRepository, UserRepository $userRepository, UserRenameEventRepository $renameEventRepository, - Paginator $paginator + PaginatorInterface $paginator ): Response { /** @var User $user */ $user = $userRepository->findUserByLogin($login);