diff --git a/src/QueryObjectDataSource.php b/src/QueryObjectDataSource.php index 27d6103..bed5794 100644 --- a/src/QueryObjectDataSource.php +++ b/src/QueryObjectDataSource.php @@ -118,6 +118,7 @@ public function getData(): array { if ($this->data) { return $this->data; } + return $this->getResultSet()->toArray(); } @@ -140,15 +141,14 @@ public function filter(array $filters): void if (is_callable($this->filterCallback)) { call_user_func($this->filterCallback, $this->queryObject, $filters); } - else { - foreach ($filters as $filter) { - if ($filter->isValueSet()) { - if ($filter->getConditionCallback()) { - call_user_func($filter->getConditionCallback(), $this->queryObject, $filter->getValue()); - } - elseif ($this->queryObject instanceof IQueryObject) { - $this->queryObject->searchIn($filter->getKey(), $filter->getValue(), !$filter instanceof FilterText); - } + + foreach ($filters as $filter) { + if ($filter->isValueSet()) { + if ($filter->getConditionCallback()) { + call_user_func($filter->getConditionCallback(), $this->queryObject, $filter->getValue()); + } + elseif ($this->queryObject instanceof IQueryObject) { + $this->queryObject->searchIn($filter->getKey(), $filter->getValue(), !$filter instanceof FilterText); } } }