Result: uses yield for iteration

Author: dg

src/Database/Result.php

@@ -17,10 +17,9 @@
 /**
  * Represents a database result set.
  */
-class Result implements \Iterator
+class Result implements \IteratorAggregate
 {
-	private Row|false|null $lastRow = null;
-	private int $lastRowKey = -1;
+	private bool $fetched = false;
 
 	/** @var Row[] */
 	private array $rows;
@@ -94,42 +93,20 @@ public function dump(): void
 	}
 
 
-	/********************* interface Iterator ****************d*g**/
+	/********************* interface IteratorAggregate ****************d*g**/
 
 
-	public function rewind(): void
+	/** @return \Generator<Row> */
+	public function getIterator(): \Generator
 	{
-		if ($this->lastRow === false) {
+		if ($this->fetched) {
 			throw new Nette\InvalidStateException(self::class . ' implements only one way iterator.');
 		}
-	}
-
-
-	public function current(): Row|false|null
-	{
-		return $this->lastRow;
-	}
-
-
-	public function key(): int
-	{
-		return $this->lastRowKey;
-	}
-
 
-	public function next(): void
-	{
-		$this->lastRow = false;
-	}
-
-
-	public function valid(): bool
-	{
-		if ($this->lastRow) {
-			return true;
+		$counter = 0;
+		while (($row = $this->fetch()) !== null) {
+			yield $counter++ => $row;
 		}
-
-		return $this->fetch() !== null;
 	}
 
 
@@ -147,13 +124,15 @@ public function fetchAssoc(?string $path = null): ?array
 
 		$data = $this->result?->fetch();
 		if ($data === null) {
+			$this->fetched = true;
 			return null;
 
-		} elseif ($this->lastRow === null && count($data) !== $this->result->getColumnCount()) {
+		} elseif (!$this->fetched && count($data) !== $this->result->getColumnCount()) {
 			$duplicates = array_filter(array_count_values(array_column($this->result->getColumnsInfo(), 'name')), fn($val) => $val > 1);
 			trigger_error("Found duplicate columns in database result set: '" . implode("', '", array_keys($duplicates)) . "'.");
 		}
 
+		$this->fetched = true;
 		return $this->normalizeRow($data);
 	}
 
@@ -164,12 +143,7 @@ public function fetchAssoc(?string $path = null): ?array
 	public function fetch(): ?Row
 	{
 		$data = $this->fetchAssoc();
-		if ($data === null) {
-			return null;
-		}
-
-		$this->lastRowKey++;
-		return $this->lastRow = Arrays::toObject($data, new Row);
+		return $data === null ? null : Arrays::toObject($data, new Row);
 	}
 
 
@@ -219,8 +193,7 @@ public function fetchPairs(string|int|\Closure|null $keyOrCallback = null, strin
 	 */
 	public function fetchAll(): array
 	{
-		$this->rows ??= iterator_to_array($this);
-		return $this->rows;
+		return $this->rows ??= iterator_to_array($this);
 	}