Merge pull request #7 from AppsDevTeam/adt-doctrine-components

Adt doctrine components

Author: thorewi

composer.json

@@ -1,21 +1,15 @@
 {
 	"name": "adt/query-object-data-source",
-	"description": "Ublaboo Datagrid data source bindings for Kdyby Doctrine query objects.",
+	"description": "Ublaboo Datagrid data source bindings for adt/base-query query objects.",
 	"type": "library",
 	"license": [
-		"MIT",
-		"BSD-3-Clause",
-		"GPL-2.0",
-		"GPL-3.0"
+		"MIT"
 	],
 	"require": {
-		"php": ">=7.1"
-	},
-	"require-dev": {
-		"kdyby/doctrine": "^3.1 || ~4.0",
-		"ublaboo/datagrid": "^5.0 || ~6.0",
-		"nette/utils": "^2.4 || ~3.0",
-		"nette/di": "^2.4 || ~3.0"
+		"php": ">=7.4",
+		"adt/base-query": "^2.0",
+		"ublaboo/datagrid": "^6.0",
+		"nette/di": "^2.4|^3.0"
 	},
 	"autoload": {
 		"psr-4": {

src/IQueryObjectDataSourceFactory.php

@@ -5,10 +5,10 @@
 interface IQueryObjectDataSourceFactory {
 
 	/**
-	 * @param \Kdyby\Doctrine\QueryObject $queryObject
-	 * @param \Kdyby\Doctrine\EntityRepository|null $repo
+	 * @param \ADT\DoctrineComponents\QueryObject $queryObject
+	 * @param \Doctrine\ORM\EntityRepository|null $repo
 	 * @return QueryObjectDataSource
 	 */
-	function create(\Kdyby\Doctrine\QueryObject $queryObject, \Kdyby\Doctrine\EntityRepository $repo = null);
+	function create(\ADT\DoctrineComponents\QueryObject $queryObject, \Doctrine\ORM\EntityRepository $repo = null);
 
 }

src/QueryObjectDataSource.php

@@ -10,17 +10,15 @@
 use Ublaboo\DataGrid\Utils\DateTimeHelper;
 use Ublaboo\DataGrid\DataSource\IDataSource;
 
-class QueryObjectDataSource implements IDataSource {
-
-	use \Nette\SmartObject;
-	
-	/** @var \Kdyby\Doctrine\ResultSet */
+class QueryObjectDataSource implements IDataSource
+{
+	/** @var \ADT\DoctrineComponents\ResultSet */
 	protected $resultSet;
 
-	/** @var \Kdyby\Doctrine\EntityRepository */
+	/** @var \Doctrine\ORM\EntityRepository */
 	protected $repo;
 
-	/** @var \Kdyby\Doctrine\QueryObject|IQueryObject */
+	/** @var \ADT\DoctrineComponents\QueryObject|IQueryObject */
 	protected $queryObject;
 
 	/** @var callable */
@@ -40,11 +38,11 @@ class QueryObjectDataSource implements IDataSource {
 
 	/**
 	 * QueryObjectDataSource constructor.
-	 * @param \Kdyby\Doctrine\QueryObject $queryObject
-	 * @param \Kdyby\Doctrine\EntityRepository|null $repo
+	 * @param \ADT\DoctrineComponents\QueryObject $queryObject
+	 * @param \Doctrine\ORM\EntityRepository|null $repo
 	 * @throws \Exception
 	 */
-	public function __construct(\Kdyby\Doctrine\QueryObject $queryObject, \Kdyby\Doctrine\EntityRepository $repo = null)
+	public function __construct(\ADT\DoctrineComponents\QueryObject $queryObject, \Doctrine\ORM\EntityRepository $repo = null)
 	{
 		if (!$repo && (!$queryObject instanceof IQueryObject)) {
 			throw new \Exception('"repo" must be set or "queryObject" has to implement IQueryObject interface.');
@@ -95,8 +93,7 @@ public function setLimitCallback($callback) {
 
 	protected function getResultSet() {
 		if (!$this->resultSet) {
-			$this->resultSet = $this->repo
-				->fetch($this->queryObject);
+			$this->resultSet = $this->queryObject->fetch();
 		}
 
 		return $this->resultSet;
@@ -107,9 +104,7 @@ protected function getResultSet() {
 	 * @return int
 	 */
 	public function getCount(): int {
-		return $this->repo
-			->fetch($this->queryObject)
-			->getTotalCount();
+		return $this->queryObject->fetch()->getTotalCount();
 	}
 
 	/**
@@ -181,7 +176,7 @@ public function filterOne(array $filter): IDataSource {
 	 * @param int $limit
 	 * @return static
 	 */
-	public function limit($offset, $limit): IDataSource {
+	public function limit(int $offset, int $limit): IDataSource {
 		$defaultCallback = function () use ($offset, $limit) {
 			$this->getResultSet()->applyPaging($offset, $limit);
 		};