Selection: uses yield for iteration

Author: dg

src/Database/Table/Selection.php

@@ -18,10 +18,10 @@
  * Represents filtered table result.
  * Selection is based on the great library NotORM http://www.notorm.com written by Jakub Vrana.
  * @template T of ActiveRow
- * @implements \Iterator<T>
+ * @implements \IteratorAggregate<T>
  * @implements \ArrayAccess<T>
  */
-class Selection implements \Iterator, \ArrayAccess, \Countable
+class Selection implements \IteratorAggregate, \ArrayAccess, \Countable
 {
 	protected readonly Explorer $explorer;
 	protected readonly ?Nette\Caching\Cache $cache;
@@ -59,9 +59,6 @@ class Selection implements \Iterator, \ArrayAccess, \Countable
 	/** should instance observe accessed columns caching */
 	protected ?self $observeCache = null;
 
-	/** of primary key values */
-	protected array $keys = [];
-
 
 	/**
 	 * Creates filtered table representation.
@@ -971,43 +968,18 @@ public function getReferencingTable(
 	}
 
 
-	/********************* interface Iterator ****************d*g**/
+	/********************* interface IteratorAggregate ****************d*g**/
 
 
-	public function rewind(): void
+	/** @return \Generator<T> */
+	public function getIterator(): \Generator
 	{
 		$this->execute();
-		$this->keys = array_keys($this->data);
-		reset($this->keys);
-	}
-
-
-	/** @return T|false */
-	public function current(): ActiveRow|false
-	{
-		return ($key = current($this->keys)) !== false
-			? $this->data[$key]
-			: false;
-	}
-
-
-	public function key(): string|int
-	{
-		return current($this->keys);
-	}
-
-
-	public function next(): void
-	{
-		do {
-			next($this->keys);
-		} while (($key = current($this->keys)) !== false && !isset($this->data[$key]));
-	}
-
-
-	public function valid(): bool
-	{
-		return current($this->keys) !== false;
+		foreach ($this->data as $key => $value) {
+			if (isset($this->data[$key])) { // may be unset by offsetUnset
+				yield $key => $value;
+			}
+		}
 	}