unify Aggregator interface to a single one

src/Collection/Aggregations/IDbalAggregator.php → src/Collection/Aggregations/Aggregator.php

@@ -8,8 +8,28 @@
 use Nextras\Orm\Collection\Functions\Result\DbalExpressionResult;
 
 
-interface IDbalAggregator extends IAggregator
+/**
+ * @template T The type of the aggregation result value.
+ */
+interface Aggregator
 {
+	/**
+	 * Returns a grouping "key" used to join multiple conditions/joins together.
+	 *
+	 * In SQL, it is used as table alias suffix.
+	 *
+	 * @return literal-string
+	 */
+	public function getAggregateKey(): string;
+
+
+	/**
+	 * @param array<T> $values
+	 * @return T|null
+	 */
+	public function aggregateValues(array $values);
+
+
 	public function aggregateExpression(
 		QueryBuilder $queryBuilder,
 		DbalExpressionResult $expression,

src/Collection/Aggregations/AnyAggregator.php

@@ -14,9 +14,9 @@
 
 
 /**
- * @implements IArrayAggregator<bool>
+ * @implements Aggregator<bool>
  */
-class AnyAggregator implements IDbalAggregator, IArrayAggregator
+class AnyAggregator implements Aggregator
 {
 	/** @var literal-string */
 	private string $aggregateKey;

src/Collection/Aggregations/CountAggregator.php

@@ -14,9 +14,9 @@
 
 
 /**
- * @implements IArrayAggregator<bool>
+ * @implements Aggregator<bool>
  */
-class CountAggregator implements IDbalAggregator, IArrayAggregator
+class CountAggregator implements Aggregator
 {
 	private int $atLeast;
 

src/Collection/Aggregations/NoneAggregator.php

@@ -14,9 +14,9 @@
 
 
 /**
- * @implements IArrayAggregator<bool>
+ * @implements Aggregator<bool>
  */
-class NoneAggregator implements IDbalAggregator, IArrayAggregator
+class NoneAggregator implements Aggregator
 {
 	/** @var literal-string */
 	private string $aggregateKey;

src/Collection/Aggregations/NumericAggregator.php

@@ -10,9 +10,9 @@
 
 /**
  * @internal
- * @implements IArrayAggregator<number>
+ * @implements Aggregator<number>
  */
-class NumericAggregator implements IDbalAggregator, IArrayAggregator
+class NumericAggregator implements Aggregator
 {
 	/**
 	 * @param callable(array<number>): (number|null) $arrayAggregation

src/Collection/Functions/BaseCompareFunction.php

@@ -4,8 +4,7 @@
 
 
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
-use Nextras\Orm\Collection\Aggregations\IArrayAggregator;
-use Nextras\Orm\Collection\Aggregations\IDbalAggregator;
+use Nextras\Orm\Collection\Aggregations\Aggregator;
 use Nextras\Orm\Collection\Expression\ExpressionContext;
 use Nextras\Orm\Collection\Functions\Result\ArrayExpressionResult;
 use Nextras\Orm\Collection\Functions\Result\DbalExpressionResult;
@@ -22,7 +21,7 @@ public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): ArrayExpressionResult
 	{
 		assert(count($args) === 2);
@@ -61,7 +60,7 @@ public function processDbalExpression(
 		QueryBuilder $builder,
 		array $args,
 		ExpressionContext $context,
-		?IDbalAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): DbalExpressionResult
 	{
 		assert(count($args) === 2);

src/Collection/Functions/BaseNumericAggregateFunction.php

@@ -4,8 +4,7 @@
 
 
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
-use Nextras\Orm\Collection\Aggregations\IArrayAggregator;
-use Nextras\Orm\Collection\Aggregations\IDbalAggregator;
+use Nextras\Orm\Collection\Aggregations\Aggregator;
 use Nextras\Orm\Collection\Aggregations\NumericAggregator;
 use Nextras\Orm\Collection\Expression\ExpressionContext;
 use Nextras\Orm\Collection\Functions\Result\ArrayExpressionResult;
@@ -34,7 +33,7 @@ public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): ArrayExpressionResult
 	{
 		assert(count($args) === 1 && is_string($args[0]));
@@ -56,7 +55,7 @@ public function processDbalExpression(
 		QueryBuilder $builder,
 		array $args,
 		ExpressionContext $context,
-		?IDbalAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): DbalExpressionResult
 	{
 		assert(count($args) === 1 && is_string($args[0]));

src/Collection/Functions/CollectionFunction.php

@@ -4,8 +4,7 @@
 
 
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
-use Nextras\Orm\Collection\Aggregations\IArrayAggregator;
-use Nextras\Orm\Collection\Aggregations\IDbalAggregator;
+use Nextras\Orm\Collection\Aggregations\Aggregator;
 use Nextras\Orm\Collection\Expression\ExpressionContext;
 use Nextras\Orm\Collection\Functions\Result\ArrayExpressionResult;
 use Nextras\Orm\Collection\Functions\Result\DbalExpressionResult;
@@ -27,26 +26,27 @@ interface CollectionFunction
 	 * execution.
 	 * Usually returns a boolean for filtering evaluation.
 	 * @param array<mixed> $args
-	 * @param IArrayAggregator<mixed>|null $aggregator
+	 * @param Aggregator<mixed>|null $aggregator
 	 */
 	public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): ArrayExpressionResult;
 
 
 	/**
 	 * Returns true if entity should stay in the result collection; the condition is evaluated in database and this
 	 * method just returns appropriate Nextras Dbal's filtering expression for passed args.
 	 * @param array<int|string, mixed> $args
+	 * @param Aggregator<mixed>|null $aggregator
 	 */
 	public function processDbalExpression(
 		DbalQueryBuilderHelper $helper,
 		QueryBuilder $builder,
 		array $args,
 		ExpressionContext $context,
-		?IDbalAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): DbalExpressionResult;
 }

src/Collection/Functions/CompareLikeFunction.php

@@ -5,8 +5,7 @@
 
 use Nette\Utils\Strings;
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
-use Nextras\Orm\Collection\Aggregations\IArrayAggregator;
-use Nextras\Orm\Collection\Aggregations\IDbalAggregator;
+use Nextras\Orm\Collection\Aggregations\Aggregator;
 use Nextras\Orm\Collection\Expression\ExpressionContext;
 use Nextras\Orm\Collection\Expression\LikeExpression;
 use Nextras\Orm\Collection\Functions\Result\ArrayExpressionResult;
@@ -25,7 +24,7 @@ public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): ArrayExpressionResult
 	{
 		assert(count($args) === 2);
@@ -66,7 +65,7 @@ public function processDbalExpression(
 		QueryBuilder $builder,
 		array $args,
 		ExpressionContext $context,
-		?IDbalAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): DbalExpressionResult
 	{
 		assert(count($args) === 2);

src/Collection/Functions/ConjunctionOperatorFunction.php

@@ -4,16 +4,14 @@
 
 
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
-use Nextras\Orm\Collection\Aggregations\IArrayAggregator;
-use Nextras\Orm\Collection\Aggregations\IDbalAggregator;
+use Nextras\Orm\Collection\Aggregations\Aggregator;
 use Nextras\Orm\Collection\Expression\ExpressionContext;
 use Nextras\Orm\Collection\Functions\Result\ArrayExpressionResult;
 use Nextras\Orm\Collection\Functions\Result\DbalExpressionResult;
 use Nextras\Orm\Collection\Helpers\ArrayCollectionHelper;
 use Nextras\Orm\Collection\Helpers\ConditionParser;
 use Nextras\Orm\Collection\Helpers\DbalQueryBuilderHelper;
 use Nextras\Orm\Entity\IEntity;
-use Nextras\Orm\Exception\InvalidArgumentException;
 use Nextras\Orm\Exception\InvalidStateException;
 
 
@@ -33,13 +31,12 @@ public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): ArrayExpressionResult
 	{
 		[$normalized, $newAggregator] = $this->normalizeFunctions($args);
 		if ($newAggregator !== null) {
 			if ($aggregator !== null) throw new InvalidStateException("Cannot apply two aggregations simultaneously.");
-			if (!$newAggregator instanceof IArrayAggregator) throw new InvalidArgumentException('Array requires aggregation instance of IArrayAggregator.');
 			$aggregator = $newAggregator;
 		}
 
@@ -50,7 +47,7 @@ public function processArrayExpression(
 		 * aggregation.
 		 */
 
-		/** @var array<string, IArrayAggregator<bool>> $aggregators */
+		/** @var array<string, Aggregator<bool>> $aggregators */
 		$aggregators = [];
 		$values = [];
 		$sizes = [];
@@ -107,7 +104,7 @@ public function processDbalExpression(
 		QueryBuilder $builder,
 		array $args,
 		ExpressionContext $context,
-		?IDbalAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): DbalExpressionResult
 	{
 		return $this->processQueryBuilderExpressionWithModifier(

src/Collection/Functions/DisjunctionOperatorFunction.php

@@ -4,16 +4,14 @@
 
 
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
-use Nextras\Orm\Collection\Aggregations\IArrayAggregator;
-use Nextras\Orm\Collection\Aggregations\IDbalAggregator;
+use Nextras\Orm\Collection\Aggregations\Aggregator;
 use Nextras\Orm\Collection\Expression\ExpressionContext;
 use Nextras\Orm\Collection\Functions\Result\ArrayExpressionResult;
 use Nextras\Orm\Collection\Functions\Result\DbalExpressionResult;
 use Nextras\Orm\Collection\Helpers\ArrayCollectionHelper;
 use Nextras\Orm\Collection\Helpers\ConditionParser;
 use Nextras\Orm\Collection\Helpers\DbalQueryBuilderHelper;
 use Nextras\Orm\Entity\IEntity;
-use Nextras\Orm\Exception\InvalidArgumentException;
 use Nextras\Orm\Exception\InvalidStateException;
 
 
@@ -33,17 +31,16 @@ public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): ArrayExpressionResult
 	{
 		[$normalized, $newAggregator] = $this->normalizeFunctions($args);
 		if ($newAggregator !== null) {
 			if ($aggregator !== null) throw new InvalidStateException("Cannot apply two aggregations simultaneously.");
-			if (!$newAggregator instanceof IArrayAggregator) throw new InvalidArgumentException('Array requires aggregation instance of IArrayAggregator.');
 			$aggregator = $newAggregator;
 		}
 
-		/** @var array<string, IArrayAggregator<bool>> $aggregators */
+		/** @var array<string, Aggregator<bool>> $aggregators */
 		$aggregators = [];
 		$values = [];
 		$sizes = [];
@@ -100,7 +97,7 @@ public function processDbalExpression(
 		QueryBuilder $builder,
 		array $args,
 		ExpressionContext $context,
-		?IDbalAggregator $aggregator = null,
+		?Aggregator $aggregator = null,
 	): DbalExpressionResult
 	{
 		return $this->processQueryBuilderExpressionWithModifier(