Skip to content

Commit c2d6f09

Browse files
authored
Remove deprecated notice (#230)
1 parent 76573cf commit c2d6f09

File tree

6 files changed

+14
-24
lines changed

6 files changed

+14
-24
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ matrix:
4747
- DEPENDENCIES=dev
4848
- COMPOSER_FLAGS="--ignore-platform-reqs"
4949
allow_failures:
50-
- env: DEPENDENCIES=dev
50+
- php: 8.0snapshot
5151

5252
before_install:
5353
- if [ "$DEPENDENCIES" != "" ]; then composer config minimum-stability ${DEPENDENCIES}; fi;

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"php": ">=7.2",
2424
"symfony/event-dispatcher": "^4.4|^5.0",
2525
"symfony/framework-bundle": "^4.4|^5.0",
26-
"symfony/property-access": "^4.4|^5.0",
2726
"symfony/options-resolver": "^4.4|^5.0",
27+
"symfony/property-access": "^4.4|^5.0",
2828
"symfony/translation": "^4.4|^5.0"
2929
},
3030
"require-dev": {
@@ -33,7 +33,7 @@
3333
"ext-pdo_sqlite": "*",
3434
"ext-zip": "*",
3535
"doctrine/common": "^2.6|^3.0",
36-
"doctrine/doctrine-bundle": "^2.1|^3.0",
36+
"doctrine/doctrine-bundle": "^2.3|^3.0",
3737
"doctrine/orm": "^2.6.3",
3838
"doctrine/persistence": "^1.3.4|^2.0",
3939
"friendsofphp/php-cs-fixer": "^2.7",

src/DataTable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public function getResponse(): Response
309309
$response['template'] = $this->renderer->renderDataTable($this, $this->template, $this->templateParams);
310310
}
311311

312-
return JsonResponse::create($response);
312+
return new JsonResponse($response);
313313
}
314314

315315
protected function getInitialResponse(): array

src/DataTableState.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function applyParameters(ParameterBag $parameters)
9191
$this->start = (int) $parameters->get('start', $this->start);
9292
$this->length = (int) $parameters->get('length', $this->length);
9393

94-
$search = $parameters->get('search', []);
94+
$search = $parameters->all()['search'] ?? [];
9595
$this->setGlobalSearch($search['value'] ?? $this->globalSearch);
9696

9797
$this->handleOrderBy($parameters);
@@ -102,7 +102,7 @@ private function handleOrderBy(ParameterBag $parameters)
102102
{
103103
if ($parameters->has('order')) {
104104
$this->orderBy = [];
105-
foreach ($parameters->get('order', []) as $order) {
105+
foreach ($parameters->all()['order'] ?? [] as $order) {
106106
$column = $this->getDataTable()->getColumn((int) $order['column']);
107107
$this->addOrderBy($column, $order['dir'] ?? DataTable::SORT_ASCENDING);
108108
}
@@ -111,7 +111,7 @@ private function handleOrderBy(ParameterBag $parameters)
111111

112112
private function handleSearch(ParameterBag $parameters)
113113
{
114-
foreach ($parameters->get('columns', []) as $key => $search) {
114+
foreach ($parameters->all()['columns'] ?? [] as $key => $search) {
115115
$column = $this->dataTable->getColumn((int) $key);
116116
$value = $this->isInitial ? $search : $search['search']['value'];
117117

tests/Fixtures/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ imports:
22
- { resource: services.yml }
33

44
framework:
5+
annotations:
6+
enabled: true
57
secret: '1234567890'
68
router:
9+
utf8: true
710
resource: '%kernel.project_dir%/routing.yml'
811
strict_requirements: ~
912
default_locale: 'en'
@@ -29,15 +32,12 @@ doctrine:
2932
auto_generate_proxy_classes: '%kernel.debug%'
3033
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
3134
auto_mapping: true
32-
metadata_cache_driver:
33-
type: service
34-
id: doctrine.system_cache_provider
3535
query_cache_driver:
36-
type: service
37-
id: doctrine.system_cache_provider
36+
type: pool
37+
pool: doctrine.system_cache_pool
3838
result_cache_driver:
39-
type: service
40-
id: doctrine.result_cache_provider
39+
type: pool
40+
pool: doctrine.result_cache_pool
4141

4242
twig:
4343
debug: '%kernel.debug%'

tests/Fixtures/services.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@ services:
1111
resource: 'AppBundle/Controller'
1212
tags: ['controller.service_arguments']
1313

14-
doctrine.result_cache_provider:
15-
class: Symfony\Component\Cache\DoctrineProvider
16-
arguments:
17-
- '@doctrine.result_cache_pool'
18-
19-
doctrine.system_cache_provider:
20-
class: Symfony\Component\Cache\DoctrineProvider
21-
arguments:
22-
- '@doctrine.system_cache_pool'
23-
2414
twig.extension.string_loader:
2515
class: Twig\Extension\StringLoaderExtension
2616
tags:

0 commit comments

Comments
 (0)