refaktorizace

Author: Walusyak

src/QueryObjectDataSource.php

@@ -91,9 +91,9 @@ public function setLimitCallback($callback) {
 		return $this;
 	}
 
-	protected function getResultSet() {
+	protected function getResultSet(int $page = 1, ?int $itemsPerPage = null) {
 		if (!$this->resultSet) {
-			$this->resultSet = $this->queryObject->fetch();
+			$this->resultSet = $this->queryObject->getResultSet($page, $itemsPerPage);
 		}
 
 		return $this->resultSet;
@@ -104,7 +104,7 @@ protected function getResultSet() {
 	 * @return int
 	 */
 	public function getCount(): int {
-		return $this->queryObject->fetch()->getTotalCount();
+		return $this->queryObject->count();
 	}
 
 	/**
@@ -116,7 +116,7 @@ public function getData(): array {
 			return $this->data;
 		}
 
-		return $this->getResultSet()->toArray();
+		return iterator_to_array($this->getResultSet()->getIterator());
 	}
 
 	/**
@@ -177,15 +177,12 @@ public function filterOne(array $filter): IDataSource {
 	 * @return static
 	 */
 	public function limit(int $offset, int $limit): IDataSource {
-		$defaultCallback = function () use ($offset, $limit) {
-			$this->getResultSet()->applyPaging($offset, $limit);
-		};
 
 		if (is_callable($this->limitCallback)) {
 			call_user_func_array($this->limitCallback, [$offset, $limit, $defaultCallback]);
 
 		} else {
-			$defaultCallback();
+			$this->getResultSet($offset / $limit + 1, $limit);
 		}
 
 		return $this;