1010
1111class PackagePaginator implements EntityPaginatorInterface
1212{
13- private ?int $ currentPage = null ;
14- private ?int $ pageSize = null ;
15- private ?int $ rangeSize = null ;
16- private ?int $ rangeEdgeSize = null ;
17- private $ results ;
18- private $ numResults ;
19- private ?int $ rangeFirstResultNumber = null ;
20- private ?int $ rangeLastResultNumber = null ;
13+ private int $ currentPage ;
14+ private int $ pageSize ;
15+ private int $ rangeSize ;
16+ private int $ rangeEdgeSize ;
17+ private array $ results ;
18+ private int $ numResults ;
2119
2220 public function __construct (
2321 private readonly UrlGeneratorInterface $ router ,
@@ -33,18 +31,16 @@ public function paginate(PaginatorDto $paginatorDto, QueryBuilder $queryBuilder)
3331 $ this ->rangeEdgeSize = $ paginatorDto ->getRangeEdgeSize ();
3432 $ this ->currentPage = max (1 , $ paginatorDto ->getPageNumber ());
3533 $ firstResult = ($ this ->currentPage - 1 ) * $ this ->pageSize ;
36- $ this ->rangeFirstResultNumber = $ this ->pageSize * ($ this ->currentPage - 1 ) + 1 ;
37- $ this ->rangeLastResultNumber = $ this ->rangeFirstResultNumber + $ this ->pageSize - 1 ;
34+ $ rangeFirstResultNumber = $ this ->pageSize * ($ this ->currentPage - 1 ) + 1 ;
3835
3936 $ countQueryBuilder = clone $ queryBuilder ;
4037 $ this ->numResults = $ countQueryBuilder
4138 ->select ('COUNT(package.id) ' )
4239 ->getQuery ()
4340 ->getSingleScalarResult ();
4441
45- if ($ this -> rangeFirstResultNumber > $ this ->numResults ) {
42+ if ($ rangeFirstResultNumber > $ this ->numResults ) {
4643 $ this ->results = [];
47- $ this ->rangeLastResultNumber = $ this ->numResults ;
4844
4945 return $ this ;
5046 }
@@ -57,9 +53,6 @@ public function paginate(PaginatorDto $paginatorDto, QueryBuilder $queryBuilder)
5753 ->getResult ();
5854
5955 $ this ->results = $ results ;
60- if ($ this ->rangeLastResultNumber > $ this ->numResults ) {
61- $ this ->rangeLastResultNumber = $ this ->numResults ;
62- }
6356
6457 return $ this ;
6558 }
0 commit comments