Skip to content

Commit 3f743bc

Browse files
author
Tony Vermeiren
committed
Require php 8.1
1 parent dcb7eaa commit 3f743bc

9 files changed

+55
-58
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"require": {
14-
"php": ">=5.4"
14+
"php": ">=8.1"
1515
},
1616
"config": {
1717
"bin-dir": "bin"

‎src/Column.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@ class Column
4444
/**
4545
* Column constructor
4646
*
47-
* @param string $name
48-
* @param string $dbField
47+
* @param string|null $name
48+
* @param string|null $dbField
4949
* @param bool $searchable
5050
* @param bool $orderable
51-
* @param null|array $classes
51+
* @param array|null $classes
5252
*/
5353
public function __construct(
54-
$name,
55-
$dbField,
56-
$searchable,
57-
$orderable,
58-
$classes = []
54+
?string $name,
55+
?string $dbField,
56+
bool $searchable,
57+
bool $orderable,
58+
?array $classes = []
5959
) {
6060
$this->name = $name;
6161
$this->dbField = $dbField;
@@ -67,39 +67,39 @@ public function __construct(
6767
/**
6868
* @return string
6969
*/
70-
public function getName()
70+
public function getName(): string
7171
{
7272
return $this->name;
7373
}
7474

7575
/**
7676
* @return string
7777
*/
78-
public function getDbField()
78+
public function getDbField(): string
7979
{
8080
return $this->dbField;
8181
}
8282

8383
/**
8484
* @return bool
8585
*/
86-
public function isSearchable()
86+
public function isSearchable(): bool
8787
{
8888
return $this->searchable;
8989
}
9090

9191
/**
9292
* @return bool
9393
*/
94-
public function isOrderable()
94+
public function isOrderable(): bool
9595
{
9696
return $this->orderable;
9797
}
9898

9999
/**
100-
* @return array
100+
* @return array|null
101101
*/
102-
public function getClasses()
102+
public function getClasses(): ?array
103103
{
104104
return $this->classes;
105105
}

‎src/ColumnTransformerInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ interface ColumnTransformerInterface
1818
*
1919
* @return array
2020
*/
21-
public function transform(array $data);
21+
public function transform(array $data): array;
2222
}

‎src/Columns.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ public function __construct(array $columns)
4040
/**
4141
* {@inheritdoc}
4242
*/
43-
public function offsetExists($offset)
43+
public function offsetExists($offset): bool
4444
{
4545
return array_key_exists($offset, $this->columns);
4646
}
4747

4848
/**
4949
* {@inheritdoc}
5050
*/
51-
public function offsetGet($offset)
51+
public function offsetGet($offset): mixed
5252
{
5353
if ($this->offsetExists($offset) === false) {
5454
throw new \InvalidArgumentException(sprintf('%s column not available', $offset));
@@ -60,7 +60,7 @@ public function offsetGet($offset)
6060
/**
6161
* {@inheritdoc}
6262
*/
63-
public function offsetSet($offset, $value)
63+
public function offsetSet($offset, $value): void
6464
{
6565
if ($this->offsetExists($offset) === false) {
6666
$this->columns[$offset] = $value;
@@ -70,7 +70,7 @@ public function offsetSet($offset, $value)
7070
/**
7171
* {@inheritdoc}
7272
*/
73-
public function offsetUnset($offset)
73+
public function offsetUnset($offset): void
7474
{
7575
if ($this->offsetExists($offset) === false) {
7676
unset($this->columns[$offset]);
@@ -80,47 +80,47 @@ public function offsetUnset($offset)
8080
/**
8181
* {@inheritdoc}
8282
*/
83-
public function rewind()
83+
public function rewind(): void
8484
{
8585
$this->position = 0;
8686
}
8787

8888
/**
8989
* {@inheritdoc}
9090
*/
91-
public function current()
91+
public function current(): mixed
9292
{
9393
return $this->columns[$this->position];
9494
}
9595

9696
/**
9797
* {@inheritdoc}
9898
*/
99-
public function key()
99+
public function key(): mixed
100100
{
101101
return $this->position;
102102
}
103103

104104
/**
105105
* {@inheritdoc}
106106
*/
107-
public function next()
107+
public function next(): void
108108
{
109109
++$this->position;
110110
}
111111

112112
/**
113113
* {@inheritdoc}
114114
*/
115-
public function valid()
115+
public function valid(): bool
116116
{
117117
return array_key_exists($this->position, $this->columns);
118118
}
119119

120120
/**
121121
* @return array
122122
*/
123-
public function getSearchableFields()
123+
public function getSearchableFields(): array
124124
{
125125
$searchable = array();
126126

‎src/DataProvider.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,13 @@ public function getData(
2929
Columns $columns,
3030
DataTablesRepositoryInterface $dataTablesRepository,
3131
ColumnTransformerInterface $columnTransformer
32-
) {
33-
$data = array(
32+
): array {
33+
return array(
3434
'draw' => $parameters->getDraw(),
3535
'recordsTotal' => $dataTablesRepository->getDataTablesTotalRecordsCount($parameters, $columns),
3636
'recordsFiltered' => $dataTablesRepository->getDataTablesFilteredRecordsCount($parameters, $columns),
3737
'data' => $this->getColumns($parameters, $columns, $dataTablesRepository, $columnTransformer),
3838
);
39-
40-
return $data;
4139
}
4240

4341
/**
@@ -53,10 +51,9 @@ private function getColumns(
5351
Columns $columns,
5452
DataTablesRepositoryInterface $dataTablesRepository,
5553
ColumnTransformerInterface $columnTransformer
56-
) {
54+
): array {
5755
$data = $dataTablesRepository->getDataTablesData($parameters, $columns);
58-
$columnsData = $columnTransformer->transform($data);
5956

60-
return $columnsData;
57+
return $columnTransformer->transform($data);
6158
}
6259
}

‎src/DataTablesRepositoryInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ interface DataTablesRepositoryInterface
2424
*
2525
* @return int
2626
*/
27-
public function getDataTablesTotalRecordsCount(Parameters $parameters, Columns $columns);
27+
public function getDataTablesTotalRecordsCount(Parameters $parameters, Columns $columns): int;
2828

2929
/**
3030
* @param Parameters $parameters
3131
* @param Columns $columns
3232
*
3333
* @return int
3434
*/
35-
public function getDataTablesFilteredRecordsCount(Parameters $parameters, Columns $columns);
35+
public function getDataTablesFilteredRecordsCount(Parameters $parameters, Columns $columns): int;
3636

3737
/**
3838
* @param Parameters $parameters
3939
* @param Columns $columns
4040
*
4141
* @return array
4242
*/
43-
public function getDataTablesData(Parameters $parameters, Columns $columns);
43+
public function getDataTablesData(Parameters $parameters, Columns $columns): array;
4444
}

‎src/Doctrine/ODM/DataTablesRepositoryTrait.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ trait DataTablesRepositoryTrait
2121
/**
2222
* {@inheritdoc}
2323
*/
24-
public function getDataTablesTotalRecordsCount(Parameters $parameters, Columns $columns)
24+
public function getDataTablesTotalRecordsCount(Parameters $parameters, Columns $columns): int
2525
{
2626
return iterator_count($this->createQueryBuilder()->getQuery()->execute());
2727
}
2828

2929
/**
3030
* {@inheritdoc}
3131
*/
32-
public function getDataTablesFilteredRecordsCount(Parameters $parameters, Columns $columns)
32+
public function getDataTablesFilteredRecordsCount(Parameters $parameters, Columns $columns): int
3333
{
3434
return iterator_count($this->getFilteredDataTablesQb($parameters, $columns)->getQuery()->execute());
3535
}
3636

3737
/**
3838
* {@inheritdoc}
3939
*/
40-
public function getDataTablesData(Parameters $parameters, Columns $columns)
40+
public function getDataTablesData(Parameters $parameters, Columns $columns): array
4141
{
4242
$qb = $this->getFilteredDataTablesQb($parameters, $columns);
4343
$qb->limit($parameters->getLength())->skip($parameters->getStart());

‎src/Doctrine/ORM/DataTablesRepositoryTrait.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ trait DataTablesRepositoryTrait
2323
/**
2424
* {@inheritdoc}
2525
*/
26-
public function getDataTablesTotalRecordsCount(Parameters $parameters, Columns $columns)
26+
public function getDataTablesTotalRecordsCount(Parameters $parameters, Columns $columns): int
2727
{
2828
return $this->createQueryBuilder(self::ENTITY_ALIAS)
2929
->select('count(' . self::ENTITY_ALIAS . ')')
@@ -34,7 +34,7 @@ public function getDataTablesTotalRecordsCount(Parameters $parameters, Columns $
3434
/**
3535
* {@inheritdoc}
3636
*/
37-
public function getDataTablesFilteredRecordsCount(Parameters $parameters, Columns $columns)
37+
public function getDataTablesFilteredRecordsCount(Parameters $parameters, Columns $columns): int
3838
{
3939
$qb = $this->getFilteredDataTablesQb($parameters, $columns);
4040

@@ -46,7 +46,7 @@ public function getDataTablesFilteredRecordsCount(Parameters $parameters, Column
4646
/**
4747
* {@inheritdoc}
4848
*/
49-
public function getDataTablesData(Parameters $parameters, Columns $columns)
49+
public function getDataTablesData(Parameters $parameters, Columns $columns): array
5050
{
5151
$qb = $this->getFilteredDataTablesQb($parameters, $columns);
5252
$qb->setFirstResult($parameters->getStart())

0 commit comments

Comments
 (0)