better generic typings, fix DbalMapper->toEntity()

src/Mapper/Dbal/DbalMapper.php

@@ -185,6 +185,7 @@ public function toCollection($data): ICollection
 	/**
 	 * @param QueryBuilder|Result|Row|array $data
 	 * @phpstan-param QueryBuilder|Result|Row|array<string, mixed> $data
+	 * @return E|null
 	 */
 	public function toEntity($data): ?IEntity
 	{

tests/inc/model/author/AuthorsRepository.php

@@ -19,7 +19,7 @@ static function getEntityClassNames(): array
 
 
 	/**
-	 * @return Author[]|ICollection<Author>
+	 * @return ICollection<Author>
 	 */
 	public function findByTags(string $name): ICollection
 	{

tests/inc/model/book/BooksMapper.php

@@ -4,7 +4,6 @@
 
 
 use Nextras\Orm\Collection\ICollection;
-use Nextras\Orm\Entity\IEntity;
 use Nextras\Orm\Mapper\Dbal\Conventions\IConventions;
 use Nextras\Orm\Mapper\Dbal\DbalMapper;
 
@@ -22,7 +21,7 @@ public function findBooksWithEvenId(): ICollection
 
 
 	/** @return Book|null */
-	public function findFirstBook(): ?IEntity
+	public function findFirstBook(): ?Book
 	{
 		return $this->toEntity($this->builder()->where('id = 1'));
 	}

tests/inc/model/book/BooksRepository.php

@@ -8,7 +8,7 @@
 
 
 /**
- * @method ICollection<Book>|Book[] findBooksWithEvenId()
+ * @method ICollection<Book> findBooksWithEvenId()
  * @method Book|null findFirstBook()
  * @extends Repository<Book>
  */
@@ -20,7 +20,7 @@ static function getEntityClassNames(): array
 	}
 
 
-	/** @return Book[]|ICollection<Book> */
+	/** @return ICollection<Book> */
 	public function findLatest(): ICollection
 	{
 		return $this->findAll()
@@ -29,7 +29,7 @@ public function findLatest(): ICollection
 	}
 
 
-	/** @return Book[]|ICollection<Book> */
+	/** @return ICollection<Book> */
 	public function findByTags(string $name): ICollection
 	{
 		return $this->findBy(['tags->name' => $name]);