Skip to content

Commit 4f8a2a9

Browse files
committed
Update dependencies a ton
1 parent 750dc08 commit 4f8a2a9

39 files changed

+29
-364
lines changed

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ All notable changes to `omines\datatables-bundle` will be documented in this fil
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

55
## [Unreleased]
6-
Nothing yet.
6+
### Changed
7+
- Make compatible with Doctrine Bundle 2.0
8+
- Make compatible with Symfony 5.0
9+
- Drop Symfony 3.x compatibility
10+
- Drop PHP <7.2 compatibility
711

8-
## [0.3.1] - 2019.08-09
12+
## [0.3.1] - 2019-08-09
913
### Added
1014
- Update the url used for ajax request on each init. (#75)
1115

composer.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"issues": "https://github.com/omines/datatables-bundle/issues"
2121
},
2222
"require": {
23-
"php": "^7.0.8",
24-
"symfony/framework-bundle": "^3.4|^4.1",
25-
"symfony/property-access": "^3.4|^4.1",
26-
"symfony/translation": "^3.4|^4.1"
23+
"php": "^7.2",
24+
"symfony/framework-bundle": "^4.1|^5.0",
25+
"symfony/property-access": "^4.1|^5.0",
26+
"symfony/translation": "^4.1|^5.0"
2727
},
2828
"require-dev": {
2929
"ext-pdo_sqlite": "*",
@@ -32,16 +32,16 @@
3232
"doctrine/orm": "^2.5",
3333
"friendsofphp/php-cs-fixer": "^2.7",
3434
"mongodb/mongodb": "^1.2",
35-
"phpunit/phpunit": "^6.1|^7.1",
36-
"ruflin/elastica": "^6.0",
37-
"symfony/browser-kit": "^3.4|^4.1",
38-
"symfony/css-selector": "^3.4|^4.1",
39-
"symfony/dom-crawler": "^3.4|^4.1",
40-
"symfony/phpunit-bridge": "^3.4|^4.1",
41-
"symfony/templating": "^3.4|^4.1",
42-
"symfony/twig-bundle": "^3.4|^4.1",
43-
"symfony/var-dumper": "^3.4|^4.1",
44-
"symfony/yaml": "^3.4|^4.1"
35+
"phpunit/phpunit": "^7.1|^8.0",
36+
"ruflin/elastica": "^6.0|^7.0",
37+
"symfony/browser-kit": "^4.1|^5.0",
38+
"symfony/css-selector": "^4.1|^5.0",
39+
"symfony/dom-crawler": "^4.1|^5.0",
40+
"symfony/phpunit-bridge": "^4.1|^5.0",
41+
"symfony/templating": "^4.1|^5.0",
42+
"symfony/twig-bundle": "^4.1|^5.0",
43+
"symfony/var-dumper": "^4.1|^5.0",
44+
"symfony/yaml": "^4.1|^5.0"
4545
},
4646
"suggest": {
4747
"doctrine/doctrine-bundle": "For integrated access to Doctrine object managers",

src/Adapter/AbstractAdapter.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ final public function getData(DataTableState $state): ResultSetInterface
6868
return new ArrayResultSet($rows, $query->getTotalRows(), $query->getFilteredRows());
6969
}
7070

71-
/**
72-
* @param AdapterQuery $query
73-
* @return array
74-
*/
7571
protected function getPropertyMap(AdapterQuery $query): array
7672
{
7773
$propertyMap = [];
@@ -82,21 +78,12 @@ protected function getPropertyMap(AdapterQuery $query): array
8278
return $propertyMap;
8379
}
8480

85-
/**
86-
* @param AdapterQuery $query
87-
*/
8881
abstract protected function prepareQuery(AdapterQuery $query);
8982

9083
/**
91-
* @param AdapterQuery $query
92-
* @param AbstractColumn $column
9384
* @return string|null
9485
*/
9586
abstract protected function mapPropertyPath(AdapterQuery $query, AbstractColumn $column);
9687

97-
/**
98-
* @param AdapterQuery $query
99-
* @return \Traversable
100-
*/
10188
abstract protected function getResults(AdapterQuery $query): \Traversable;
10289
}

src/Adapter/AdapterInterface.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,11 @@ interface AdapterInterface
2323
{
2424
/**
2525
* Provides initial configuration to the adapter.
26-
*
27-
* @param array $options
2826
*/
2927
public function configure(array $options);
3028

3129
/**
3230
* Processes a datatable's state into a result set fit for further processing.
33-
*
34-
* @param DataTableState $state
35-
* @return ResultSetInterface
3631
*/
3732
public function getData(DataTableState $state): ResultSetInterface;
3833
}

src/Adapter/AdapterQuery.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,12 @@ class AdapterQuery
3939

4040
/**
4141
* AdapterQuery constructor.
42-
*
43-
* @param DataTableState $state
4442
*/
4543
public function __construct(DataTableState $state)
4644
{
4745
$this->state = $state;
4846
}
4947

50-
/**
51-
* @return DataTableState
52-
*/
5348
public function getState(): DataTableState
5449
{
5550
return $this->state;
@@ -113,7 +108,6 @@ public function setIdentifierPropertyPath($identifierPropertyPath): self
113108
}
114109

115110
/**
116-
* @param string $key
117111
* @param mixed $default
118112
* @return mixed|null
119113
*/
@@ -123,7 +117,6 @@ public function get(string $key, $default = null)
123117
}
124118

125119
/**
126-
* @param string $key
127120
* @param $value
128121
*/
129122
public function set(string $key, $value)

src/Adapter/ArrayAdapter.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ public function getData(DataTableState $state): ResultSetInterface
7979
}
8080

8181
/**
82-
* @param DataTableState $state
83-
* @param array $data
84-
* @param array $map
8582
* @return \Generator
8683
*/
8784
protected function processData(DataTableState $state, array $data, array $map)
@@ -99,10 +96,6 @@ protected function processData(DataTableState $state, array $data, array $map)
9996
}
10097

10198
/**
102-
* @param DataTableState $state
103-
* @param array $result
104-
* @param array $map
105-
* @param string $search
10699
* @return array|null
107100
*/
108101
protected function processRow(DataTableState $state, array $result, array $map, string $search)

src/Adapter/ArrayResultSet.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ class ArrayResultSet implements ResultSetInterface
3030

3131
/**
3232
* ArrayResultSet constructor.
33-
*
34-
* @param array $data
35-
* @param int|null $totalRows
36-
* @param int|null $totalFilteredRows
3733
*/
3834
public function __construct(array $data, int $totalRows = null, int $totalFilteredRows = null)
3935
{

src/Adapter/Doctrine/Event/ORMAdapterQueryEvent.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,12 @@ class ORMAdapterQueryEvent extends Event
2525

2626
/**
2727
* ORMAdapterQueryEvent constructor.
28-
*
29-
* @param Query $query
3028
*/
3129
public function __construct(Query $query)
3230
{
3331
$this->query = $query;
3432
}
3533

36-
/**
37-
* @return Query
38-
*/
3934
public function getQuery(): Query
4035
{
4136
return $this->query;

src/Adapter/Doctrine/ORM/AutomaticQueryBuilder.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ class AutomaticQueryBuilder implements QueryBuilderProcessorInterface
4545

4646
/**
4747
* AutomaticQueryBuilder constructor.
48-
*
49-
* @param EntityManagerInterface $em
50-
* @param ClassMetadata $metadata
5148
*/
5249
public function __construct(EntityManagerInterface $em, ClassMetadata $metadata)
5350
{

src/Adapter/Doctrine/ORM/SearchCriteriaProvider.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ public function process(QueryBuilder $queryBuilder, DataTableState $state)
3333
$this->processGlobalSearch($queryBuilder, $state);
3434
}
3535

36-
/**
37-
* @param QueryBuilder $queryBuilder
38-
* @param DataTableState $state
39-
*/
4036
private function processSearchColumns(QueryBuilder $queryBuilder, DataTableState $state)
4137
{
4238
foreach ($state->getSearchColumns() as $searchInfo) {
@@ -51,10 +47,6 @@ private function processSearchColumns(QueryBuilder $queryBuilder, DataTableState
5147
}
5248
}
5349

54-
/**
55-
* @param QueryBuilder $queryBuilder
56-
* @param DataTableState $state
57-
*/
5850
private function processGlobalSearch(QueryBuilder $queryBuilder, DataTableState $state)
5951
{
6052
if (!empty($globalSearch = $state->getGlobalSearch())) {

0 commit comments

Comments
 (0)