NEW Use custom list for eagerloaded relations (#10869)

src/ORM/ArrayLib.php

@@ -274,4 +274,21 @@ public static function iterateVolatile(array &$list)
             }
         }
     }
+
+    /**
+     * Similar to shuffle, but retains the existing association between the keys and the values.
+     * Shuffles the array in place.
+     */
+    public static function shuffleAssociative(array &$array): void
+    {
+        $shuffledArray = [];
+        $keys = array_keys($array);
+        shuffle($keys);
+
+        foreach ($keys as $key) {
+            $shuffledArray[$key] = $array[$key];
+        }
+
+        $array = $shuffledArray;
+    }
 }

src/ORM/Connect/MySQLQuery.php

@@ -64,11 +64,20 @@ public function getIterator(): Traversable
                 }
                 yield $data;
             }
-            // Check for the method first since $this->handle is a mixed type
-            if (method_exists($this->handle, 'data_seek')) {
-                // Reset so the query can be iterated over again
-                $this->handle->data_seek(0);
-            }
+
+            // Reset so the query can be iterated over again
+            $this->rewind();
+        }
+    }
+
+    /**
+     * Rewind to the first row
+     */
+    public function rewind(): void
+    {
+        // Check for the method first since $this->handle is a mixed type
+        if (method_exists($this->handle, 'data_seek')) {
+            $this->handle->data_seek(0);
         }
     }
 

src/ORM/Connect/MySQLStatement.php

@@ -117,9 +117,17 @@ public function getIterator(): Traversable
             yield $row;
         }
 
+        // Reset so the query can be iterated over again
+        $this->rewind();
+    }
+
+    /**
+     * Rewind to the first row
+     */
+    public function rewind(): void
+    {
         // Check for the method first since $this->statement isn't strongly typed
         if (method_exists($this->statement, 'data_seek')) {
-            // Reset so the query can be iterated over again
             $this->statement->data_seek(0);
         }
     }