collection function: extract retreiving a collection function

nextras · May 23, 2020 · 7aa81d0 · 7aa81d0
1 parent 54b4523
commit 7aa81d0
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/Collection/Helpers/DbalQueryBuilderHelper.php b/src/Collection/Helpers/DbalQueryBuilderHelper.php
@@ -83,10 +83,7 @@ public function processPropertyExpr(QueryBuilder $builder, $expr): DbalExpressio
 	{
 		if (is_array($expr)) {
 			$function = array_shift($expr);
-			$collectionFunction = $this->repository->getCollectionFunction($function);
-			if (!$collectionFunction instanceof IQueryBuilderFunction) {
-				throw new InvalidArgumentException("Collection function $function has to implement " . IQueryBuilderFunction::class . ' interface.');
-			}
+			$collectionFunction = $this->getCollectionFunction($function);
 			return $collectionFunction->processQueryBuilderExpression($this, $builder, $expr);
 		}
 
@@ -101,10 +98,7 @@ public function processPropertyExpr(QueryBuilder $builder, $expr): DbalExpressio
 	public function processFilterFunction(QueryBuilder $builder, array $expr): DbalExpressionResult
 	{
 		$function = isset($expr[0]) ? array_shift($expr) : ICollection::AND;
-		$collectionFunction = $this->repository->getCollectionFunction($function);
-		if (!$collectionFunction instanceof IQueryBuilderFunction) {
-			throw new InvalidArgumentException("Collection function $function has to implement " . IQueryBuilderFunction::class . ' interface.');
-		}
+		$collectionFunction = $this->getCollectionFunction($function);
 		return $collectionFunction->processQueryBuilderExpression($this, $builder, $expr);
 	}
 
@@ -199,6 +193,16 @@ public function normalizeValue($value, PropertyMetadata $propertyMetadata, IConv
 	}
 
 
+	private function getCollectionFunction(string $name): IQueryBuilderFunction
+	{
+		$collectionFunction = $this->repository->getCollectionFunction($name);
+		if (!$collectionFunction instanceof IQueryBuilderFunction) {
+			throw new InvalidArgumentException("Collection function $name has to implement " . IQueryBuilderFunction::class . ' interface.');
+		}
+		return $collectionFunction;
+	}
+
+
 	/**
 	 * @param array<string> $tokens
 	 * @param class-string<\Nextras\Orm\Entity\IEntity>|null $sourceEntity