diff --git a/src/Collection/Aggregations/Aggregator.php b/src/Collection/Aggregations/Aggregator.php index 5ef07767..02824a0b 100644 --- a/src/Collection/Aggregations/Aggregator.php +++ b/src/Collection/Aggregations/Aggregator.php @@ -31,7 +31,6 @@ public function aggregateValues(array $values); public function aggregateExpression( - QueryBuilder $queryBuilder, DbalExpressionResult $expression, ExpressionContext $context, ): DbalExpressionResult; diff --git a/src/Collection/Aggregations/AnyAggregator.php b/src/Collection/Aggregations/AnyAggregator.php index d9964a18..84fa25e1 100644 --- a/src/Collection/Aggregations/AnyAggregator.php +++ b/src/Collection/Aggregations/AnyAggregator.php @@ -48,7 +48,6 @@ public function aggregateValues(array $values): bool public function aggregateExpression( - QueryBuilder $queryBuilder, DbalExpressionResult $expression, ExpressionContext $context, ): DbalExpressionResult diff --git a/src/Collection/Aggregations/CountAggregator.php b/src/Collection/Aggregations/CountAggregator.php index c974851e..7e2797d9 100644 --- a/src/Collection/Aggregations/CountAggregator.php +++ b/src/Collection/Aggregations/CountAggregator.php @@ -50,7 +50,6 @@ public function aggregateValues(array $values): bool public function aggregateExpression( - QueryBuilder $queryBuilder, DbalExpressionResult $expression, ExpressionContext $context, ): DbalExpressionResult diff --git a/src/Collection/Aggregations/NoneAggregator.php b/src/Collection/Aggregations/NoneAggregator.php index b1358ea9..85fde472 100644 --- a/src/Collection/Aggregations/NoneAggregator.php +++ b/src/Collection/Aggregations/NoneAggregator.php @@ -48,7 +48,6 @@ public function aggregateValues(array $values): bool public function aggregateExpression( - QueryBuilder $queryBuilder, DbalExpressionResult $expression, ExpressionContext $context, ): DbalExpressionResult diff --git a/src/Collection/Aggregations/NumericAggregator.php b/src/Collection/Aggregations/NumericAggregator.php index 795ce66f..1b69568e 100644 --- a/src/Collection/Aggregations/NumericAggregator.php +++ b/src/Collection/Aggregations/NumericAggregator.php @@ -40,7 +40,6 @@ public function aggregateValues(array $values): mixed public function aggregateExpression( - QueryBuilder $queryBuilder, DbalExpressionResult $expression, ExpressionContext $context, ): DbalExpressionResult diff --git a/src/Collection/Functions/BaseNumericAggregateFunction.php b/src/Collection/Functions/BaseNumericAggregateFunction.php index 335baa4f..811f9e3e 100644 --- a/src/Collection/Functions/BaseNumericAggregateFunction.php +++ b/src/Collection/Functions/BaseNumericAggregateFunction.php @@ -65,6 +65,6 @@ public function processDbalExpression( } return $helper->processExpression($builder, $args[0], $context, $this->aggregator) - ->applyAggregator($builder, ExpressionContext::ValueExpression); + ->applyAggregator(ExpressionContext::ValueExpression); } } diff --git a/src/Collection/Functions/Result/DbalExpressionResult.php b/src/Collection/Functions/Result/DbalExpressionResult.php index 324be11b..b1bf07f0 100644 --- a/src/Collection/Functions/Result/DbalExpressionResult.php +++ b/src/Collection/Functions/Result/DbalExpressionResult.php @@ -4,7 +4,6 @@ use Nextras\Dbal\Platforms\Data\Fqn; -use Nextras\Dbal\QueryBuilder\QueryBuilder; use Nextras\Orm\Collection\Aggregations\Aggregator; use Nextras\Orm\Collection\Expression\ExpressionContext; use Nextras\Orm\Entity\Reflection\PropertyMetadata; @@ -164,8 +163,8 @@ public function withHavingArgs(string $havingExpression, array $havingArgs): Dba /** * Applies the aggregator and returns modified expression result. */ - public function applyAggregator(QueryBuilder $queryBuilder, ExpressionContext $context): DbalExpressionResult + public function applyAggregator(ExpressionContext $context): DbalExpressionResult { - return $this->aggregator?->aggregateExpression($queryBuilder, $this, $context) ?? $this; + return $this->aggregator?->aggregateExpression($this, $context) ?? $this; } }