Merge pull request #7101 from morozov/object-set-as-traversable

Implement IteratorAggregate in ObjectSet subclasses

Author: morozov

src/Schema/Collections/ObjectSet.php

@@ -7,15 +7,17 @@
 use Doctrine\DBAL\Schema\Collections\Exception\ObjectAlreadyExists;
 use Doctrine\DBAL\Schema\Collections\Exception\ObjectDoesNotExist;
 use Doctrine\DBAL\Schema\Name\UnqualifiedName;
+use IteratorAggregate;
 
 /**
  * A set of objects where each object is uniquely identified by its {@link UnqualifiedName}.
  *
  * @internal
  *
  * @template E of object
+ * @template-extends IteratorAggregate<int, E>
  */
-interface ObjectSet
+interface ObjectSet extends IteratorAggregate
 {
     /**
      * Checks if the set is empty.

src/Schema/Collections/OptionallyUnqualifiedNamedObjectSet.php

@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Schema\Collections\Exception\ObjectDoesNotExist;
 use Doctrine\DBAL\Schema\Name\UnqualifiedName;
 use Doctrine\DBAL\Schema\OptionallyNamedObject;
+use Traversable;
 
 use function array_splice;
 use function count;
@@ -110,6 +111,12 @@ public function toList(): array
         return $this->elements;
     }
 
+    /** {@inheritDoc} */
+    public function getIterator(): Traversable
+    {
+        yield from $this->elements;
+    }
+
     /**
      * Replaces the element corresponding to the old key with the provided element.
      *

src/Schema/Collections/UnqualifiedNamedObjectSet.php

@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Schema\Collections\Exception\ObjectDoesNotExist;
 use Doctrine\DBAL\Schema\Name\UnqualifiedName;
 use Doctrine\DBAL\Schema\NamedObject;
+use Traversable;
 
 use function array_combine;
 use function array_keys;
@@ -97,6 +98,14 @@ public function toList(): array
         return array_values($this->elements);
     }
 
+    /** {@inheritDoc} */
+    public function getIterator(): Traversable
+    {
+        foreach ($this->elements as $element) {
+            yield $element;
+        }
+    }
+
     /**
      * Replaces the element corresponding to the old key with the provided element. The position of the element in the
      * set is preserved.

src/Schema/TableEditor.php

@@ -156,7 +156,7 @@ public function renameColumn(UnqualifiedName $oldColumnName, UnqualifiedName $ne
 
     private function renameColumnInIndexes(UnqualifiedName $oldColumnName, UnqualifiedName $newColumnName): void
     {
-        foreach ($this->indexes->toList() as $index) {
+        foreach ($this->indexes as $index) {
             $modified = false;
             $columns  = [];
 
@@ -264,7 +264,7 @@ private function renameColumnInConstraints(
         $constraints = [];
         $anyModified = false;
 
-        foreach ($collection->toList() as $constraint) {
+        foreach ($collection as $constraint) {
             $newColumnNames = [];
             $modified       = false;