Skip to content

Commit 755b0d1

Browse files
authored
Merge pull request #304 from garak/remove-php73
Remove support for php 7.3
2 parents 51aaf2c + 9dd70e7 commit 755b0d1

37 files changed

+100
-194
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,14 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
php:
33-
- '7.3'
34-
- '7.4'
35-
- '8.0'
36-
- '8.1'
3732
include:
3833
- description: 'Lowest'
39-
composer_option: '--prefer-lowest'
40-
- description: '7.4'
4134
php: '7.4'
35+
composer_option: '--prefer-lowest'
4236
- description: '8.0'
4337
php: '8.0'
4438
- description: '8.1'
4539
php: '8.1'
46-
composer_option: ''
4740
name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
4841
steps:
4942
- name: Checkout

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
],
2424
"require": {
25-
"php": "^7.3 || ^8.0",
25+
"php": "^7.4 || ^8.0",
2626
"symfony/event-dispatcher-contracts": "^2.0 || ^3.0",
2727
"symfony/http-foundation": "^4.4 || ^5.4 || ^6.0"
2828
},

src/Knp/Component/Pager/Event/AfterEvent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
final class AfterEvent extends Event
1212
{
13-
private $pagination;
13+
private PaginationInterface $pagination;
1414

1515
public function __construct(PaginationInterface $paginationView)
1616
{

src/Knp/Component/Pager/Event/BeforeEvent.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
*/
1212
final class BeforeEvent extends Event
1313
{
14-
private $eventDispatcher;
14+
private EventDispatcherInterface $eventDispatcher;
1515

16-
private $request;
16+
private ?Request $request;
1717

1818
public function __construct(EventDispatcherInterface $eventDispatcher, ?Request $request)
1919
{

src/Knp/Component/Pager/Event/ItemsEvent.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ final class ItemsEvent extends Event
1818

1919
/**
2020
* List of options
21-
*
22-
* @var array
2321
*/
24-
public $options;
22+
public array $options;
2523

2624
/**
2725
* Items result
@@ -32,14 +30,12 @@ final class ItemsEvent extends Event
3230

3331
/**
3432
* Count result
35-
*
36-
* @var integer
3733
*/
38-
public $count;
34+
public int $count;
3935

40-
private $offset;
41-
private $limit;
42-
private $customPaginationParams = [];
36+
private int $offset;
37+
private int $limit;
38+
private array $customPaginationParams = [];
4339

4440
public function __construct(int $offset, int $limit)
4541
{

src/Knp/Component/Pager/Event/PaginationEvent.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ final class PaginationEvent extends Event
1919

2020
/**
2121
* List of options
22-
*
23-
* @var array
2422
*/
25-
public $options;
23+
public array $options;
2624

27-
private $pagination;
25+
private PaginationInterface $pagination;
2826

2927
public function setPagination(PaginationInterface $pagination): void
3028
{

src/Knp/Component/Pager/Event/Subscriber/Filtration/Doctrine/ORM/QuerySubscriber.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212

1313
class QuerySubscriber implements EventSubscriberInterface
1414
{
15-
/**
16-
* @var Request
17-
*/
18-
private $request;
15+
private Request $request;
1916

2017
public function __construct(?Request $request)
2118
{

src/Knp/Component/Pager/Event/Subscriber/Filtration/FiltrationSubscriber.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ class FiltrationSubscriber implements EventSubscriberInterface
99
{
1010
/**
1111
* Lazy-load state tracker
12-
* @var bool
1312
*/
14-
private $isLoaded = false;
13+
private bool $isLoaded = false;
1514

1615
public function before(BeforeEvent $event): void
1716
{

src/Knp/Component/Pager/Event/Subscriber/Filtration/PropelQuerySubscriber.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99

1010
class PropelQuerySubscriber implements EventSubscriberInterface
1111
{
12-
/**
13-
* @var Request
14-
*/
15-
private $request;
12+
private Request $request;
1613

1714
public function __construct(?Request $request)
1815
{

src/Knp/Component/Pager/Event/Subscriber/Paginate/Callback/CallbackPagination.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ class CallbackPagination
1919
*/
2020
private $items;
2121

22-
/**
23-
* @param callable $count
24-
* @param callable $items
25-
*/
2622
public function __construct(callable $count, callable $items)
2723
{
2824
$this->count = $count;
@@ -36,6 +32,6 @@ public function getPaginationCount(): int
3632

3733
public function getPaginationItems(int $offset, int $limit): array
3834
{
39-
return call_user_func_array($this->items, [$offset, $limit]);
35+
return call_user_func($this->items, $offset, $limit);
4036
}
4137
}

0 commit comments

Comments
 (0)