Skip to content

Commit 87e0066

Browse files
committed
Revert "Fix depreciations (#198)"
This reverts commit 5ccdc12
1 parent be5edb2 commit 87e0066

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

src/Adapter/Doctrine/FetchJoinORMAdapter.php

+1
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public function getResults(AdapterQuery $query): \Traversable
114114

115115
foreach ($paginator->getIterator() as $result) {
116116
yield $result;
117+
$this->manager->detach($result);
117118
}
118119
}
119120

src/Adapter/Doctrine/ORMAdapter.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,10 @@ protected function getResults(AdapterQuery $query): \Traversable
193193
$state->getDataTable()->getEventDispatcher()->dispatch($event, ORMAdapterEvents::PRE_QUERY);
194194

195195
foreach ($query->iterate([], $this->hydrationMode) as $result) {
196-
yield array_values($result)[0];
196+
yield $entity = array_values($result)[0];
197+
if (Query::HYDRATE_OBJECT === $this->hydrationMode) {
198+
$this->manager->detach($entity);
199+
}
197200
}
198201
}
199202

src/DataTable.php

+1-1
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 new JsonResponse($response);
312+
return JsonResponse::create($response);
313313
}
314314

315315
protected function getInitialResponse(): array

src/DataTableState.php

+3-3
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->all('search');
94+
$search = $parameters->get('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->all('order') as $order) {
105+
foreach ($parameters->get('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->all('columns') as $key => $search) {
114+
foreach ($parameters->get('columns', []) as $key => $search) {
115115
$column = $this->dataTable->getColumn((int) $key);
116116
$value = $this->isInitial ? $search : $search['search']['value'];
117117

0 commit comments

Comments
 (0)