Merge 846c04d into f015e26

composer.json

@@ -36,7 +36,7 @@
 		"marc-mabe/php-enum": "~4.6",
 		"mockery/mockery": ">=1.5.1",
 		"phpstan/extension-installer": "1.2.0",
-		"phpstan/phpstan": "1.8.0",
+		"phpstan/phpstan": "1.9.14",
 		"phpstan/phpstan-deprecation-rules": "1.0.0",
 		"phpstan/phpstan-nette": "1.1.0",
 		"phpstan/phpstan-mockery": "1.1.0",

src/Collection/ArrayCollection.php

@@ -187,7 +187,7 @@ public function fetchChecked(): IEntity
 
 	public function fetchAll()
 	{
-		return iterator_to_array($this->getIterator());
+		return iterator_to_array($this->getIterator(), preserve_keys: false);
 	}
 
 

src/Collection/DbalCollection.php

@@ -198,7 +198,7 @@ public function fetchChecked(): IEntity
 
 	public function fetchAll()
 	{
-		return iterator_to_array($this->getIterator());
+		return iterator_to_array($this->getIterator(), preserve_keys: false);
 	}
 
 

src/Collection/Functions/IArrayFunction.php

@@ -19,7 +19,7 @@ interface IArrayFunction
 	 * Returns a value depending on values of entity; the expression passed by args is evaluated during this method
 	 * execution.
 	 * Usually returns a boolean for filtering evaluation.
-	 * @phpstan-param array<int|string, mixed> $args
+	 * @phpstan-param array<mixed> $args
 	 * @phpstan-param IArrayAggregator<mixed>|null $aggregator
 	 */
 	public function processArrayExpression(

src/Collection/Functions/JunctionFunctionTrait.php

@@ -20,7 +20,7 @@ trait JunctionFunctionTrait
 {
 	/**
 	 * Normalizes directly entered column => value expression to expression array.
-	 * @phpstan-param array<string, mixed>|list<mixed> $args
+	 * @phpstan-param array<mixed> $args
 	 * @phpstan-return array{list<mixed>, IAggregator|null}
 	 */
 	protected function normalizeFunctions(array $args): array
@@ -54,7 +54,7 @@ protected function normalizeFunctions(array $args): array
 
 	/**
 	 * @param literal-string $dbalModifier either %or or %and dbal modifier
-	 * @param array<int|string, mixed> $args
+	 * @param array<mixed> $args
 	 */
 	protected function processQueryBuilderExpressionWithModifier(
 		string $dbalModifier,

src/Collection/HasManyCollection.php

@@ -165,7 +165,7 @@ public function fetchChecked(): IEntity
 
 	public function fetchAll()
 	{
-		return iterator_to_array($this->getIterator());
+		return iterator_to_array($this->getIterator(), preserve_keys: false);
 	}
 
 

src/Collection/Helpers/ArrayCollectionHelper.php

@@ -43,7 +43,7 @@ public function __construct(IRepository $repository)
 
 
 	/**
-	 * @phpstan-param array<string, mixed>|list<mixed> $expr
+	 * @phpstan-param array<mixed> $expr
 	 * @phpstan-param IArrayAggregator<mixed>|null $aggregator
 	 * @phpstan-return Closure(IEntity): ArrayPropertyValueReference
 	 */

src/Collection/Helpers/ConditionParser.php

@@ -16,6 +16,7 @@
 use function array_shift;
 use function explode;
 use function is_subclass_of;
+use function PHPStan\dumpType;
 use function preg_match;
 use function strpos;
 use function trigger_error;
@@ -29,7 +30,6 @@ class ConditionParser
 	// language=PhpRegExp
 	protected const PATH_REGEXP = '(?:([\w\\\]+)::)?([\w\\\]++(?:->\w++)*+)';
 
-
 	/**
 	 * @return array{class-string, string}
 	 */
@@ -78,6 +78,7 @@ public function parsePropertyExpr(string $propertyPath): array
 
 		/** @var string $source */
 		$source = array_shift($matches);
+		assert(count($matches) > 0);
 		$tokens = explode('->', array_shift($matches));
 
 		if ($source === '') {

src/Collection/Helpers/DbalExpressionResult.php

@@ -8,6 +8,7 @@
 use Nextras\Orm\Entity\Reflection\PropertyMetadata;
 use Nextras\Orm\Exception\InvalidArgumentException;
 use function array_unshift;
+use function array_values;
 
 
 /**
@@ -77,12 +78,12 @@ class DbalExpressionResult
 
 
 	/**
-	 * @phpstan-param literal-string $expression
 	 * @param mixed[] $args
 	 * @param DbalJoinEntry[] $joins
 	 * @param array<array<mixed>> $groupBy
-	 * @phpstan-param list<mixed> $args
 	 * @param bool $isHavingClause
+	 * @phpstan-param literal-string $expression
+	 * @phpstan-param list<mixed> $args
 	 * @phpstan-param literal-string $dbalModifier
 	 */
 	public function __construct(
@@ -117,11 +118,11 @@ public function __construct(
 	 * Appends SQL expression to the original expression.
 	 * If you need prepend or other complex expression, create new instance of DbalExpressionResult.
 	 * @phpstan-param literal-string $expression
-	 * @phpstan-param list<mixed> $args
+	 * @phpstan-param mixed ...$args
 	 */
 	public function append(string $expression, ...$args): DbalExpressionResult
 	{
-		$args = array_merge($this->args, $args);
+		$args = array_values(array_merge($this->args, $args));
 		return $this->withArgs("{$this->expression} $expression", $args);
 	}
 
@@ -143,7 +144,7 @@ public function getArgumentsForExpansion(): array
 	 * Creates a new DbalExpression from the passed $args and keeps the original expression
 	 * properties (joins, aggregator, ...).
 	 * @phpstan-param literal-string $expression
-	 * @param array<mixed> $args
+	 * @param list<mixed> $args
 	 */
 	public function withArgs(string $expression, array $args): DbalExpressionResult
 	{

src/Collection/Helpers/DbalQueryBuilderHelper.php

@@ -130,7 +130,7 @@ public function processFilterFunction(
 
 
 	/**
-	 * @phpstan-return array{string, list<mixed>}
+	 * @phpstan-return list<mixed>
 	 */
 	public function processOrderDirection(DbalExpressionResult $expression, string $direction): array
 	{

src/Collection/ICollection.php

@@ -108,7 +108,7 @@ public function getByIdChecked($id): IEntity;
 	 *      ['property' => 'value2'],
 	 * ]
 	 * </code>
-	 * @phpstan-param array<string, mixed>|array<int|string, mixed>|list<mixed> $conds
+	 * @phpstan-param array<mixed> $conds
 	 * @return static
 	 */
 	public function findBy(array $conds): ICollection;

src/Entity/Reflection/MetadataParser.php

@@ -182,7 +182,7 @@ protected function parseAnnotations(ReflectionClass $reflection, array $methods)
 			$isReadonly = $access === '-read';
 
 			$property = new PropertyMetadata();
-			$property->name = (string) $variable;
+			$property->name = $variable;
 			$property->isReadonly = $isReadonly;
 
 			$this->parseAnnotationTypes($property, $type);

src/Relationships/HasMany.php

@@ -14,6 +14,7 @@
 use Nextras\Orm\Exception\LogicException;
 use Nextras\Orm\Mapper\IRelationshipMapper;
 use Nextras\Orm\Repository\IRepository;
+use function array_values;
 use function assert;
 use function is_array;
 use function iterator_count;
@@ -113,10 +114,13 @@ public function convertToRawValue($value)
 	}
 
 
+	/**
+	 * @param list<E>|list<string>|list<int>|mixed $value
+	 */
 	public function setRawValue($value): void
 	{
 		if (is_array($value)) {
-			$this->set($value);
+			$this->set(array_values($value));
 		}
 	}
 

src/Repository/Repository.php

@@ -40,6 +40,7 @@
 use Nextras\Orm\Model\IModel;
 use Nextras\Orm\Model\MetadataStorage;
 use ReflectionClass;
+use function array_values;
 use function count;
 use function sort;
 
@@ -260,7 +261,7 @@ public function findBy(array $conds): ICollection
 
 
 	/**
-	 * @param array<mixed>|mixed $ids
+	 * @param list<mixed>|mixed $ids
 	 * @return ICollection<E>
 	 * @deprecated Use {@see findByIds()}.
 	 */
@@ -269,7 +270,7 @@ public function findById($ids): ICollection
 		if (!is_array($ids)) {
 			return $this->findByIds([$ids]);
 		} else {
-			return $this->findByIds($ids);
+			return $this->findByIds(array_values($ids));
 		}
 	}
 

tests/cases/unit/Collection/ArrayCollectionTest.phpt

@@ -37,7 +37,7 @@ class ArrayCollectionTest extends TestCase
 	public function testPassingNonList(): void
 	{
 		Assert::throws(function (): void {
-			new ArrayCollection([
+			new ArrayCollection([ // @phpstan-ignore-line
 				1 => $this->e(Author::class),
 			], $this->orm->authors);
 		}, InvalidArgumentException::class);

tests/cases/unit/Entity/AbstractEntity.getters_setters.phpt

@@ -9,6 +9,7 @@ namespace NextrasTests\Orm\Entity\Fragments;
 
 use Mockery;
 use Nextras\Orm\Entity\AbstractEntity;
+use Nextras\Orm\Entity\Entity;
 use Nextras\Orm\Entity\Reflection\EntityMetadata;
 use Nextras\Orm\Entity\Reflection\PropertyMetadata;
 use NextrasTests\Orm\TestCase;
@@ -21,7 +22,7 @@ require_once __DIR__ . '/../../../bootstrap.php';
 /**
  * @property string|null $isMain
  */
-class GetterSetterTestEntity extends AbstractEntity
+class GetterSetterTestEntity extends Entity
 {
 	protected function createMetadata(): EntityMetadata
 	{