Merge branch 'dependabot/composer/phpstan/phpstan-0.12.90'

nextras · Jul 2, 2021 · 82d0cfc · 82d0cfc
2 parents a0b9ae6 + 5d3b7e1
commit 82d0cfc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
 		"marc-mabe/php-enum": "~3.0",
 		"mockery/mockery": "~1.2",
 		"phpstan/extension-installer": "1.1.0",
-		"phpstan/phpstan": "0.12.88",
+		"phpstan/phpstan": "0.12.90",
 		"phpstan/phpstan-deprecation-rules": "0.12.6",
 		"phpstan/phpstan-nette": "0.12.17",
 		"phpstan/phpstan-mockery": "0.12.14",

diff --git a/src/Collection/ArrayCollection.php b/src/Collection/ArrayCollection.php
@@ -26,7 +26,7 @@ class ArrayCollection implements ICollection
 {
 	/**
 	 * @var callable[]
-	 * @phpstan-var list<callable(\Traversable $entities): void>
+	 * @phpstan-var list<callable(\Traversable<E> $entities): void>
 	 */
 	public $onEntityFetch = [];
 
@@ -212,9 +212,11 @@ public function getIterator(): Iterator
 			$collection = clone $this;
 			$collection->relationshipMapper = null;
 			$collection->relationshipParent = null;
+			/** @var Iterator<E> $entityIterator */
 			$entityIterator = $this->relationshipMapper->getIterator($this->relationshipParent, $collection);
 		} else {
 			$this->processData();
+			/** @var Iterator<E> $entityIterator */
 			$entityIterator = new EntityIterator($this->data);
 		}
 
@@ -226,7 +228,6 @@ public function getIterator(): Iterator
 			$this->entityFetchEventTriggered = true;
 		}
 
-		/** @phpstan-var Iterator<E> */
 		return $entityIterator;
 	}
 

diff --git a/src/Collection/DbalCollection.php b/src/Collection/DbalCollection.php
@@ -25,7 +25,7 @@ class DbalCollection implements ICollection
 {
 	/**
 	 * @var callable[]
-	 * @phpstan-var list<callable(\Traversable $entities): void>
+	 * @phpstan-var list<callable(\Traversable<E> $entities): void>
 	 */
 	public $onEntityFetch = [];
 
@@ -216,13 +216,15 @@ public function __call(string $name, array $args)
 	public function getIterator(): Iterator
 	{
 		if ($this->relationshipParent !== null && $this->relationshipMapper !== null) {
+			/** @phpstan-var Iterator<E> */
 			$entityIterator = $this->relationshipMapper->getIterator($this->relationshipParent, $this);
 		} else {
 			if ($this->result === null) {
 				$this->execute();
 			}
 
 			assert(is_array($this->result));
+			/** @phpstan-var Iterator<E> */
 			$entityIterator = new EntityIterator($this->result);
 		}
 
@@ -234,7 +236,6 @@ public function getIterator(): Iterator
 			$this->entityFetchEventTriggered = true;
 		}
 
-		/** @phpstan-var Iterator<E> */
 		return $entityIterator;
 	}