cleanup, php 8 touch-up in collections namespace

nextras · Jul 22, 2023 · 9b42e74 · 9b42e74
1 parent 08f7f48
commit 9b42e74
Show file tree

Hide file tree

Showing 25 changed files with 93 additions and 81 deletions.
diff --git a/src/Collection/Aggregations/AnyAggregator.php b/src/Collection/Aggregations/AnyAggregator.php
@@ -61,7 +61,7 @@ public function aggregateExpression(
 			toExpression: $join->toExpression,
 			toArgs: $join->toArgs,
 			toAlias: $join->toAlias,
-			onExpression:  "($join->onExpression) AND $expression->expression",
+			onExpression: "($join->onExpression) AND $expression->expression",
 			onArgs: array_merge($join->onArgs, $expression->args),
 			conventions: $join->conventions,
 		);

diff --git a/src/Collection/DbalCollection.php b/src/Collection/DbalCollection.php
@@ -325,7 +325,7 @@ public function getQueryBuilder(): QueryBuilder
 			$expression = $helper->processExpression(
 				$this->queryBuilder,
 				$args,
-				null
+				null,
 			);
 			$joins = $expression->joins;
 			if ($expression->isHavingClause) {
@@ -355,7 +355,7 @@ public function getQueryBuilder(): QueryBuilder
 		if (count($groupBy) > 0) {
 			$this->queryBuilder->groupBy(
 				'%ex' . str_repeat(', %ex', count($groupBy) - 1),
-				...$groupBy
+				...$groupBy,
 			);
 		}
 

diff --git a/src/Collection/Functions/AvgAggregateFunction.php b/src/Collection/Functions/AvgAggregateFunction.php
@@ -20,7 +20,7 @@ public function __construct()
 					return array_sum($values) / $count;
 				},
 				dbalAggregationFunction: 'AVG',
-			)
+			),
 		);
 	}
 }
diff --git a/src/Collection/Functions/BaseCompareFunction.php b/src/Collection/Functions/BaseCompareFunction.php
@@ -21,7 +21,7 @@ public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null
+		?IArrayAggregator $aggregator = null,
 	): ArrayExpressionResult
 	{
 		assert(count($args) === 2);
@@ -38,18 +38,18 @@ public function processArrayExpression(
 				function ($value) use ($targetValue): bool {
 					return $this->evaluateInPhp($value, $targetValue);
 				},
-				$valueReference->value
+				$valueReference->value,
 			);
 			return new ArrayExpressionResult(
-				$values,
-				$valueReference->aggregator,
-				null
+				value: $values,
+				aggregator: $valueReference->aggregator,
+				propertyMetadata: null,
 			);
 		} else {
 			return new ArrayExpressionResult(
-				$this->evaluateInPhp($valueReference->value, $targetValue),
-				null,
-				null
+				value: $this->evaluateInPhp($valueReference->value, $targetValue),
+				aggregator: null,
+				propertyMetadata: null,
 			);
 		}
 	}
@@ -59,7 +59,7 @@ public function processDbalExpression(
 		DbalQueryBuilderHelper $helper,
 		QueryBuilder $builder,
 		array $args,
-		?IDbalAggregator $aggregator = null
+		?IDbalAggregator $aggregator = null,
 	): DbalExpressionResult
 	{
 		assert(count($args) === 2);
@@ -77,20 +77,15 @@ public function processDbalExpression(
 	}
 
 
-	/**
-	 * @param mixed $sourceValue
-	 * @param mixed $targetValue
-	 */
-	abstract protected function evaluateInPhp($sourceValue, $targetValue): bool;
+	abstract protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool;
 
 
 	/**
-	 * @param mixed $value
 	 * @phpstan-param literal-string $modifier
 	 */
 	abstract protected function evaluateInDb(
 		DbalExpressionResult $expression,
-		$value,
-		string $modifier
+		mixed $value,
+		string $modifier,
 	): DbalExpressionResult;
 }
diff --git a/src/Collection/Functions/BaseNumericAggregateFunction.php b/src/Collection/Functions/BaseNumericAggregateFunction.php
@@ -33,7 +33,7 @@ public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null
+		?IArrayAggregator $aggregator = null,
 	): ArrayExpressionResult
 	{
 		assert(count($args) === 1 && is_string($args[0]));
@@ -54,7 +54,7 @@ public function processDbalExpression(
 		DbalQueryBuilderHelper $helper,
 		QueryBuilder $builder,
 		array $args,
-		?IDbalAggregator $aggregator = null
+		?IDbalAggregator $aggregator = null,
 	): DbalExpressionResult
 	{
 		assert(count($args) === 1 && is_string($args[0]));

diff --git a/src/Collection/Functions/CollectionFunction.php b/src/Collection/Functions/CollectionFunction.php
@@ -32,9 +32,10 @@ public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null
+		?IArrayAggregator $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.
@@ -44,6 +45,6 @@ public function processDbalExpression(
 		DbalQueryBuilderHelper $helper,
 		QueryBuilder $builder,
 		array $args,
-		?IDbalAggregator $aggregator = null
+		?IDbalAggregator $aggregator = null,
 	): DbalExpressionResult;
 }
diff --git a/src/Collection/Functions/CompareEqualsFunction.php b/src/Collection/Functions/CompareEqualsFunction.php
@@ -15,7 +15,7 @@
 
 class CompareEqualsFunction extends BaseCompareFunction
 {
-	protected function evaluateInPhp($sourceValue, $targetValue): bool
+	protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	{
 		if (is_array($targetValue)) {
 			return in_array($sourceValue, $targetValue, true);
@@ -25,7 +25,11 @@ protected function evaluateInPhp($sourceValue, $targetValue): bool
 	}
 
 
-	protected function evaluateInDb(DbalExpressionResult $expression, $value, string $modifier): DbalExpressionResult
+	protected function evaluateInDb(
+		DbalExpressionResult $expression,
+		mixed $value,
+		string $modifier,
+	): DbalExpressionResult
 	{
 		if (is_array($value)) {
 			if (count($value) > 0) {

diff --git a/src/Collection/Functions/CompareGreaterThanEqualsFunction.php b/src/Collection/Functions/CompareGreaterThanEqualsFunction.php
@@ -8,13 +8,17 @@
 
 class CompareGreaterThanEqualsFunction extends BaseCompareFunction
 {
-	protected function evaluateInPhp($sourceValue, $targetValue): bool
+	protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	{
 		return $sourceValue >= $targetValue;
 	}
 
 
-	protected function evaluateInDb(DbalExpressionResult $expression, $value, string $modifier): DbalExpressionResult
+	protected function evaluateInDb(
+		DbalExpressionResult $expression,
+		mixed $value,
+		string $modifier,
+	): DbalExpressionResult
 	{
 		return $expression->append(">= $modifier", $value);
 	}

diff --git a/src/Collection/Functions/CompareGreaterThanFunction.php b/src/Collection/Functions/CompareGreaterThanFunction.php
@@ -8,13 +8,17 @@
 
 class CompareGreaterThanFunction extends BaseCompareFunction
 {
-	protected function evaluateInPhp($sourceValue, $targetValue): bool
+	protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	{
 		return $sourceValue > $targetValue;
 	}
 
 
-	protected function evaluateInDb(DbalExpressionResult $expression, $value, string $modifier): DbalExpressionResult
+	protected function evaluateInDb(
+		DbalExpressionResult $expression,
+		mixed $value,
+		string $modifier,
+	): DbalExpressionResult
 	{
 		return $expression->append("> $modifier", $value);
 	}

diff --git a/src/Collection/Functions/CompareLikeFunction.php b/src/Collection/Functions/CompareLikeFunction.php
@@ -24,7 +24,7 @@ public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null
+		?IArrayAggregator $aggregator = null,
 	): ArrayExpressionResult
 	{
 		assert(count($args) === 2);
@@ -46,7 +46,7 @@ public function processArrayExpression(
 				function ($value) use ($mode, $targetValue): bool {
 					return $this->evaluateInPhp($mode, $value, $targetValue);
 				},
-				$valueReference->value
+				$valueReference->value,
 			);
 			return new ArrayExpressionResult(
 				value: $values,
@@ -64,7 +64,7 @@ public function processDbalExpression(
 		DbalQueryBuilderHelper $helper,
 		QueryBuilder $builder,
 		array $args,
-		?IDbalAggregator $aggregator = null
+		?IDbalAggregator $aggregator = null,
 	): DbalExpressionResult
 	{
 		assert(count($args) === 2);

diff --git a/src/Collection/Functions/CompareNotEqualsFunction.php b/src/Collection/Functions/CompareNotEqualsFunction.php
@@ -15,7 +15,7 @@
 
 class CompareNotEqualsFunction extends BaseCompareFunction
 {
-	protected function evaluateInPhp($sourceValue, $targetValue): bool
+	protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	{
 		if (is_array($targetValue)) {
 			return !in_array($sourceValue, $targetValue, true);
@@ -25,7 +25,11 @@ protected function evaluateInPhp($sourceValue, $targetValue): bool
 	}
 
 
-	protected function evaluateInDb(DbalExpressionResult $expression, $value, string $modifier): DbalExpressionResult
+	protected function evaluateInDb(
+		DbalExpressionResult $expression,
+		mixed $value,
+		string $modifier,
+	): DbalExpressionResult
 	{
 		if (is_array($value)) {
 			if (count($value) > 0) {

diff --git a/src/Collection/Functions/CompareSmallerThanEqualsFunction.php b/src/Collection/Functions/CompareSmallerThanEqualsFunction.php
@@ -8,13 +8,17 @@
 
 class CompareSmallerThanEqualsFunction extends BaseCompareFunction
 {
-	protected function evaluateInPhp($sourceValue, $targetValue): bool
+	protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	{
 		return $sourceValue <= $targetValue;
 	}
 
 
-	protected function evaluateInDb(DbalExpressionResult $expression, $value, string $modifier): DbalExpressionResult
+	protected function evaluateInDb(
+		DbalExpressionResult $expression,
+		mixed $value,
+		string $modifier,
+	): DbalExpressionResult
 	{
 		return $expression->append("<= $modifier", $value);
 	}

diff --git a/src/Collection/Functions/CompareSmallerThanFunction.php b/src/Collection/Functions/CompareSmallerThanFunction.php
@@ -8,13 +8,17 @@
 
 class CompareSmallerThanFunction extends BaseCompareFunction
 {
-	protected function evaluateInPhp($sourceValue, $targetValue): bool
+	protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	{
 		return $sourceValue < $targetValue;
 	}
 
 
-	protected function evaluateInDb(DbalExpressionResult $expression, $value, string $modifier): DbalExpressionResult
+	protected function evaluateInDb(
+		DbalExpressionResult $expression,
+		mixed $value,
+		string $modifier,
+	): DbalExpressionResult
 	{
 		return $expression->append("< $modifier", $value);
 	}

diff --git a/src/Collection/Functions/ConjunctionOperatorFunction.php b/src/Collection/Functions/ConjunctionOperatorFunction.php
@@ -21,21 +21,18 @@ class ConjunctionOperatorFunction implements CollectionFunction
 	use JunctionFunctionTrait;
 
 
-	/** @var ConditionParser */
-	protected $conditionParser;
-
-
-	public function __construct(ConditionParser $conditionParserHelper)
+	public function __construct(
+		private readonly ConditionParser $conditionParser,
+	)
 	{
-		$this->conditionParser = $conditionParserHelper;
 	}
 
 
 	public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null
+		?IArrayAggregator $aggregator = null,
 	): ArrayExpressionResult
 	{
 		[$normalized, $newAggregator] = $this->normalizeFunctions($args);
@@ -108,15 +105,15 @@ public function processDbalExpression(
 		DbalQueryBuilderHelper $helper,
 		QueryBuilder $builder,
 		array $args,
-		?IDbalAggregator $aggregator = null
+		?IDbalAggregator $aggregator = null,
 	): DbalExpressionResult
 	{
 		return $this->processQueryBuilderExpressionWithModifier(
-			'%and',
-			$helper,
-			$builder,
-			$args,
-			$aggregator
+			dbalModifier: '%and',
+			helper: $helper,
+			builder: $builder,
+			args: $args,
+			aggregator: $aggregator,
 		);
 	}
 }
diff --git a/src/Collection/Functions/CountAggregateFunction.php b/src/Collection/Functions/CountAggregateFunction.php
@@ -15,7 +15,7 @@ public function __construct()
 			new NumericAggregator(
 				arrayAggregation: static fn (array $values): int => count($values),
 				dbalAggregationFunction: 'COUNT',
-			)
+			),
 		);
 	}
 }
diff --git a/src/Collection/Functions/DisjunctionOperatorFunction.php b/src/Collection/Functions/DisjunctionOperatorFunction.php
@@ -21,21 +21,18 @@ class DisjunctionOperatorFunction implements CollectionFunction
 	use JunctionFunctionTrait;
 
 
-	/** @var ConditionParser */
-	private $conditionParser;
-
-
-	public function __construct(ConditionParser $conditionParserHelper)
+	public function __construct(
+		private readonly ConditionParser $conditionParser,
+	)
 	{
-		$this->conditionParser = $conditionParserHelper;
 	}
 
 
 	public function processArrayExpression(
 		ArrayCollectionHelper $helper,
 		IEntity $entity,
 		array $args,
-		?IArrayAggregator $aggregator = null
+		?IArrayAggregator $aggregator = null,
 	): ArrayExpressionResult
 	{
 		[$normalized, $newAggregator] = $this->normalizeFunctions($args);
@@ -101,15 +98,15 @@ public function processDbalExpression(
 		DbalQueryBuilderHelper $helper,
 		QueryBuilder $builder,
 		array $args,
-		?IDbalAggregator $aggregator = null
+		?IDbalAggregator $aggregator = null,
 	): DbalExpressionResult
 	{
 		return $this->processQueryBuilderExpressionWithModifier(
-			'%or',
-			$helper,
-			$builder,
-			$args,
-			$aggregator
+			dbalModifier: '%or',
+			helper: $helper,
+			builder: $builder,
+			args: $args,
+			aggregator: $aggregator,
 		);
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ public function __construct() @@
     					return array_sum($values) / $count;
     				},
     				dbalAggregationFunction: 'AVG',
-    			)
+    			),
     		);
     	}
     }