Merge 08bb9ff into 9bcb30a

nextras · Apr 2, 2024 · 7472f0f · 7472f0f
2 parents 9bcb30a + 08bb9ff
commit 7472f0f
Show file tree

Hide file tree

Showing 13 changed files with 71 additions and 44 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
 		"nette/tester": "~2.5",
 		"mockery/mockery": ">=1.5.1",
 		"phpstan/extension-installer": "1.3.1",
-		"phpstan/phpstan": "1.10.59",
+		"phpstan/phpstan": "1.10.66",
 		"phpstan/phpstan-deprecation-rules": "1.1.4",
 		"phpstan/phpstan-nette": "1.2.9",
 		"phpstan/phpstan-mockery": "1.1.2",

diff --git a/src/Collection/Functions/BaseCompareFunction.php b/src/Collection/Functions/BaseCompareFunction.php
@@ -74,19 +74,19 @@ public function processDbalExpression(
 			$value = $args[1];
 		}
 
-		return $this->evaluateInDb($expression, $value, $expression->dbalModifier ?? '%any');
+		return $this->evaluateInDb($expression, $value, $expression->dbalModifier);
 	}
 
 
 	abstract protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool;
 
 
 	/**
-	 * @param literal-string $modifier
+	 * @param literal-string|array<literal-string|null>|null $modifier
 	 */
 	abstract protected function evaluateInDb(
 		DbalExpressionResult $expression,
 		mixed $value,
-		string $modifier,
+		string|array|null $modifier,
 	): DbalExpressionResult;
 }
diff --git a/src/Collection/Functions/CompareEqualsFunction.php b/src/Collection/Functions/CompareEqualsFunction.php
@@ -4,8 +4,8 @@
 
 
 use Nextras\Orm\Collection\Functions\Result\DbalExpressionResult;
+use Nextras\Orm\Exception\InvalidArgumentException;
 use function count;
-use function explode;
 use function in_array;
 use function is_array;
 
@@ -25,30 +25,28 @@ protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	protected function evaluateInDb(
 		DbalExpressionResult $expression,
 		mixed $value,
-		string $modifier,
+		string|array|null $modifier,
 	): DbalExpressionResult
 	{
 		if (is_array($value)) {
 			if (count($value) > 0) {
 				// Multi-column primary key handling
 				// Construct multiOr simplification as array{list<Fqn>, modifiers: list<string>, values: list<list<mixed>>}
 				$args = $expression->getArgumentsForExpansion();
-				if (count($args) === 2 && $args[0] === '%column' && is_array($args[1])) {
+				if (count($args) === 2 && $args[0] === '%column' && is_array($args[1]) && is_array($modifier)) {
 					$columns = $args[1];
-					$modifiers = array_map(
-						fn (string $modifier): ?string => strlen($modifier) === 0 ? null : $modifier,
-						explode(',', $modifier)
-					);
 					$data = [];
 					foreach ($value as $dataSet) {
 						$set = [];
 						foreach ($dataSet as $i => $dataSetValue) {
-							$set[] = [$columns[$i], $dataSetValue, $modifiers[$i] ?? null];
+							$set[] = [$columns[$i], $dataSetValue, $modifier[$i] ?? null];
 						}
 						$data[] = $set;
 					}
 					return $expression->withArgs('%multiOr', [$data]);
 				} else {
+					if (is_array($modifier)) throw new InvalidArgumentException();
+					$modifier = $modifier ?? '%any';
 					if ($modifier !== '%any') $modifier .= '[]';
 					return $expression->append("IN $modifier", $value);
 				}
@@ -58,6 +56,8 @@ protected function evaluateInDb(
 		} elseif ($value === null) {
 			return $expression->append('IS NULL');
 		} else {
+			if (is_array($modifier)) throw new InvalidArgumentException();
+			$modifier = $modifier ?? '%any';
 			return $expression->append("= $modifier", $value);
 		}
 	}

diff --git a/src/Collection/Functions/CompareGreaterThanEqualsFunction.php b/src/Collection/Functions/CompareGreaterThanEqualsFunction.php
@@ -4,6 +4,8 @@
 
 
 use Nextras\Orm\Collection\Functions\Result\DbalExpressionResult;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use function is_array;
 
 
 class CompareGreaterThanEqualsFunction extends BaseCompareFunction
@@ -17,9 +19,11 @@ protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	protected function evaluateInDb(
 		DbalExpressionResult $expression,
 		mixed $value,
-		string $modifier,
+		string|array|null $modifier,
 	): DbalExpressionResult
 	{
+		if (is_array($modifier)) throw new InvalidArgumentException();
+		$modifier = $modifier ?? '%any';
 		return $expression->append(">= $modifier", $value);
 	}
 }
diff --git a/src/Collection/Functions/CompareGreaterThanFunction.php b/src/Collection/Functions/CompareGreaterThanFunction.php
@@ -4,6 +4,8 @@
 
 
 use Nextras\Orm\Collection\Functions\Result\DbalExpressionResult;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use function is_array;
 
 
 class CompareGreaterThanFunction extends BaseCompareFunction
@@ -17,9 +19,11 @@ protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	protected function evaluateInDb(
 		DbalExpressionResult $expression,
 		mixed $value,
-		string $modifier,
+		string|array|null $modifier,
 	): DbalExpressionResult
 	{
+		if (is_array($modifier)) throw new InvalidArgumentException();
+		$modifier = $modifier ?? '%any';
 		return $expression->append("> $modifier", $value);
 	}
 }
diff --git a/src/Collection/Functions/CompareNotEqualsFunction.php b/src/Collection/Functions/CompareNotEqualsFunction.php
@@ -28,30 +28,28 @@ protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	protected function evaluateInDb(
 		DbalExpressionResult $expression,
 		mixed $value,
-		string $modifier,
+		string|array|null $modifier,
 	): DbalExpressionResult
 	{
 		if (is_array($value)) {
 			if (count($value) > 0) {
 				// Multi-column primary key handling
 				// Construct multiOr simplification as array{list<Fqn>, modifiers: list<string>, values: list<list<mixed>>}
 				$args = $expression->getArgumentsForExpansion();
-				if (count($args) === 2 && $args[0] === '%column' && is_array($args[1])) {
+				if (count($args) === 2 && $args[0] === '%column' && is_array($args[1]) && is_array($modifier)) {
 					$columns = $args[1];
-					$modifiers = array_map(
-						fn (string $modifier): ?string => strlen($modifier) === 0 ? null : $modifier,
-						explode(',', $modifier)
-					);
 					$data = [];
 					foreach ($value as $dataSet) {
 						$set = [];
 						foreach ($dataSet as $i => $dataSetValue) {
-							$set[] = [$columns[$i], $dataSetValue, $modifiers[$i] ?? null];
+							$set[] = [$columns[$i], $dataSetValue, $modifier[$i] ?? null];
 						}
 						$data[] = $set;
 					}
 					return $expression->withArgs('NOT (%multiOr)', [$data]);
 				} else {
+					if (is_array($modifier)) throw new InvalidArgumentException();
+					$modifier = $modifier ?? '%any';
 					if ($modifier !== '%any') $modifier .= '[]';
 					return $expression->append("NOT IN $modifier", $value);
 				}
@@ -61,6 +59,8 @@ protected function evaluateInDb(
 		} elseif ($value === null) {
 			return $expression->append('IS NOT NULL');
 		} else {
+			if (is_array($modifier)) throw new InvalidArgumentException();
+			$modifier = $modifier ?? '%any';
 			return $expression->append("!= $modifier", $value);
 		}
 	}

diff --git a/src/Collection/Functions/CompareSmallerThanEqualsFunction.php b/src/Collection/Functions/CompareSmallerThanEqualsFunction.php
@@ -4,6 +4,8 @@
 
 
 use Nextras\Orm\Collection\Functions\Result\DbalExpressionResult;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use function is_array;
 
 
 class CompareSmallerThanEqualsFunction extends BaseCompareFunction
@@ -17,9 +19,11 @@ protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	protected function evaluateInDb(
 		DbalExpressionResult $expression,
 		mixed $value,
-		string $modifier,
+		string|array|null $modifier,
 	): DbalExpressionResult
 	{
+		if (is_array($modifier)) throw new InvalidArgumentException();
+		$modifier = $modifier ?? '%any';
 		return $expression->append("<= $modifier", $value);
 	}
 }
diff --git a/src/Collection/Functions/CompareSmallerThanFunction.php b/src/Collection/Functions/CompareSmallerThanFunction.php
@@ -4,6 +4,8 @@
 
 
 use Nextras\Orm\Collection\Functions\Result\DbalExpressionResult;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use function is_array;
 
 
 class CompareSmallerThanFunction extends BaseCompareFunction
@@ -17,9 +19,11 @@ protected function evaluateInPhp(mixed $sourceValue, mixed $targetValue): bool
 	protected function evaluateInDb(
 		DbalExpressionResult $expression,
 		mixed $value,
-		string $modifier,
+		string|array|null $modifier,
 	): DbalExpressionResult
 	{
+		if (is_array($modifier)) throw new InvalidArgumentException();
+		$modifier = $modifier ?? '%any';
 		return $expression->append("< $modifier", $value);
 	}
 }
diff --git a/src/Collection/Functions/FetchPropertyFunction.php b/src/Collection/Functions/FetchPropertyFunction.php
@@ -202,7 +202,7 @@ private function processTokens(
 		$propertyPrefixTokens = "";
 		$makeDistinct = false;
 
-		/** @var DbalTableJoin[] $joins */
+		/** @var list<DbalTableJoin> $joins */
 		$joins = [];
 
 		foreach ($tokens as $tokenIndex => $token) {
@@ -242,7 +242,6 @@ private function processTokens(
 			throw new InvalidArgumentException("Property expression '$propertyExpression' does not fetch specific property.");
 		}
 
-		$modifier = '';
 		$column = $this->toColumnExpr(
 			$currentEntityMetadata,
 			$propertyMetadata,
@@ -270,7 +269,7 @@ private function processTokens(
 
 	/**
 	 * @param array<string> $tokens
-	 * @param DbalTableJoin[] $joins
+	 * @param list<DbalTableJoin> $joins
 	 * @param Aggregator<mixed>|null $aggregator
 	 * @param DbalMapper<IEntity> $currentMapper
 	 * @return array{string, IConventions, EntityMetadata, DbalMapper<IEntity>}
@@ -368,6 +367,7 @@ private function processRelationship(
 
 
 	/**
+	 * @param literal-string|list<literal-string|null>|null $modifier
 	 * @return Fqn|list<Fqn>
 	 */
 	private function toColumnExpr(
@@ -376,20 +376,21 @@ private function toColumnExpr(
 		IConventions $conventions,
 		string $alias,
 		string $propertyPrefixTokens,
-		string &$modifier,
+		string|array|null &$modifier,
 	): Fqn|array
 	{
 		if ($propertyMetadata->isPrimary && $propertyMetadata->isVirtual) { // primary-proxy
 			$primaryKey = $entityMetadata->getPrimaryKey();
 			if (count($primaryKey) > 1) { // composite primary key
 				$pair = [];
+				/** @var list<literal-string|null> $modifiers */
 				$modifiers = [];
 				foreach ($primaryKey as $columnName) {
 					$columnName = $conventions->convertEntityToStorageKey($propertyPrefixTokens . $columnName);
 					$pair[] = new Fqn(schema: $alias, name: $columnName);
 					$modifiers[] = $conventions->getModifier($columnName);
 				}
-				$modifier = implode(',', $modifiers);
+				$modifier = $modifiers;
 				return $pair;
 			} else {
 				$propertyName = $primaryKey[0];

diff --git a/src/Collection/Functions/Result/DbalExpressionResult.php b/src/Collection/Functions/Result/DbalExpressionResult.php
@@ -40,7 +40,7 @@ class DbalExpressionResult
 	 * @param bool $isHavingClause True if the expression represents HAVING clause instead of WHERE clause.
 	 * @param PropertyMetadata|null $propertyMetadata Reference to backing property of the expression. If null, the expression is no more a simple property expression.
 	 * @param (callable(mixed): mixed)|null $valueNormalizer Normalizes the value for better PHP comparison, it considers the backing property type.
-	 * @param literal-string|null $dbalModifier Dbal modifier for particular column. Null if expression is a general expression.
+	 * @param literal-string|list<literal-string|null>|null $dbalModifier Dbal modifier for particular column. Array if multi-column. Null value means expression is a general expression.
 	 */
 	public function __construct(
 		public readonly string $expression,
@@ -52,7 +52,7 @@ public function __construct(
 		public readonly bool $isHavingClause = false,
 		public readonly ?PropertyMetadata $propertyMetadata = null,
 		?callable $valueNormalizer = null,
-		public readonly ?string $dbalModifier = null,
+		public readonly string|array|null $dbalModifier = null,
 	)
 	{
 		$this->valueNormalizer = $valueNormalizer;

diff --git a/src/Entity/Reflection/IMetadataParser.php b/src/Entity/Reflection/IMetadataParser.php
@@ -10,5 +10,5 @@ interface IMetadataParser
 	 * @param class-string $entityClass
 	 * @param list<string>|null $fileDependencies
 	 */
-	public function parseMetadata(string $entityClass, ?array &$fileDependencies): EntityMetadata;
+	public function parseMetadata(string $entityClass, array|null &$fileDependencies): EntityMetadata;
 }
diff --git a/src/Entity/Reflection/MetadataParser.php b/src/Entity/Reflection/MetadataParser.php
@@ -91,24 +91,25 @@ public function addModifier(string $modifier, callable $processor)
 	}
 
 
-	public function parseMetadata(string $entityClass, ?array &$fileDependencies): EntityMetadata
+	public function parseMetadata(string $entityClass, array|null &$fileDependencies): EntityMetadata
 	{
 		$this->reflection = new ReflectionClass($entityClass);
 		$this->metadata = new EntityMetadata($entityClass);
 
 		$this->loadProperties($fileDependencies);
 		$this->initPrimaryKey();
 
-		$fileDependencies = array_unique($fileDependencies);
+		if ($fileDependencies !== null) {
+			$fileDependencies = array_values(array_unique($fileDependencies));
+		}
 		return $this->metadata;
 	}
 
 
 	/**
-	 * @param string[] $fileDependencies
-	 * @param list<string> $fileDependencies
+	 * @param list<string>|null $fileDependencies
 	 */
-	protected function loadProperties(?array &$fileDependencies): void
+	protected function loadProperties(array|null &$fileDependencies): void
 	{
 		$classTree = [$current = $this->reflection->name];
 		while (($current = get_parent_class($current)) !== false) {
@@ -126,13 +127,15 @@ protected function loadProperties(?array &$fileDependencies): void
 				foreach ($traits !== false ? $traits : [] as $traitName) {
 					assert(trait_exists($traitName));
 					$reflectionTrait = new ReflectionClass($traitName);
-					$fileDependencies[] = $reflectionTrait->getFileName();
+					$file = $reflectionTrait->getFileName();
+					if ($file !== false) $fileDependencies[] = $file;
 					$this->currentReflection = $reflectionTrait;
 					$this->classPropertiesCache[$traitName] = $this->parseAnnotations($reflectionTrait, $methods);
 				}
 
 				$reflection = new ReflectionClass($class);
-				$fileDependencies[] = $reflection->getFileName();
+				$file = $reflection->getFileName();
+				if ($file !== false) $fileDependencies[] = $file;
 				$this->currentReflection = $reflection;
 				$this->classPropertiesCache[$class] = $this->parseAnnotations($reflection, $methods);
 			}