collection: fix HasManyCollection::fetch() accesing invalid iterator …

…state [closes #466]
nextras · Oct 9, 2020 · 4e27857 · 4e27857
1 parent 7272f30
commit 4e27857
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Collection/HasManyCollection.php b/src/Collection/HasManyCollection.php
@@ -131,7 +131,8 @@ public function fetch(): ?IEntity
 			$this->fetchIterator = $this->getIterator();
 		}
 
-		if (($current = $this->fetchIterator->current()) !== null) {
+		if ($this->fetchIterator->valid()) {
+			$current = $this->fetchIterator->current();
 			$this->fetchIterator->next();
 			return $current;
 		}

diff --git a/tests/cases/integration/Relationships/relationships.HasManyCollection.phpt b/tests/cases/integration/Relationships/relationships.HasManyCollection.phpt
@@ -130,6 +130,20 @@ class RelationshipsHasManyCollectionTest extends DataTestCase
 	}
 
 
+	public function testGetBy(): void
+	{
+		$book = new Book();
+		$book->title = 'test';
+		$this->orm->books->attach($book);
+
+		$author = new Author();
+		$author->books->add($book);
+
+		Assert::null($author->books->toCollection()->getBy(['title' => 'another']));
+		Assert::same($book, $author->books->toCollection()->getBy(['title' => 'test']));
+	}
+
+
 	public function testFindByRemove(): void
 	{
 		$book = $this->orm->books->getByIdChecked(3);