improvements

thorewi · thorewi · commit af891ecfed9e · 2022-07-11T13:57:20.000+02:00
diff --git a/src/IQueryObjectDataSourceFactory.php b/src/IQueryObjectDataSourceFactory.php
@@ -2,11 +2,9 @@
 
 namespace ADT\QueryObjectDataSource;
 
+use ADT\DoctrineComponents\QueryObject;
+
 interface IQueryObjectDataSourceFactory
 {
-	/**
-	 * @param \ADT\DoctrineComponents\QueryObject $queryObject
-	 * @return QueryObjectDataSource
-	 */
-	function create(\ADT\DoctrineComponents\QueryObject $queryObject);
+	public function create(QueryObject $queryObject): QueryObjectDataSource;
 }
diff --git a/src/QueryObjectDataSource.php b/src/QueryObjectDataSource.php
@@ -139,7 +139,7 @@ public function filter(array $filters): void
 					call_user_func($filter->getConditionCallback(), $this->queryObject, $filter->getValue());
 				}
 				elseif (!$filter instanceof FilterDateRange) {
-					$this->queryObject->searchIn(
+					$this->queryObject->by(
 						$filter instanceof OneColumnFilter ? $filter->getColumn() : $filter->getKey(),
 						$filter->getValue(),
 						!$filter instanceof FilterText

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace ADT\QueryObjectDataSource;`
`4`	`4`
	`5`	`+use ADT\DoctrineComponents\QueryObject;`
	`6`	`+`
`5`	`7`	`interface IQueryObjectDataSourceFactory`
`6`	`8`	`{`
`7`		`- /**`
`8`		`- * @param \ADT\DoctrineComponents\QueryObject $queryObject`
`9`		`- * @return QueryObjectDataSource`
`10`		`- */`
`11`		`- function create(\ADT\DoctrineComponents\QueryObject $queryObject);`
	`9`	`+ public function create(QueryObject $queryObject): QueryObjectDataSource;`
`12`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public function filter(array $filters): void`
`139`	`139`	`call_user_func($filter->getConditionCallback(), $this->queryObject, $filter->getValue());`
`140`	`140`	`}`
`141`	`141`	`elseif (!$filter instanceof FilterDateRange) {`
`142`		`- $this->queryObject->searchIn(`
	`142`	`+ $this->queryObject->by(`
`143`	`143`	`$filter instanceof OneColumnFilter ? $filter->getColumn() : $filter->getKey(),`
`144`	`144`	`$filter->getValue(),`
`145`	`145`	`!$filter instanceof FilterText`