Merge 3f4a4e0 into e2e4289

maciejslawik · May 14, 2021 · bdccf59 · bdccf59
2 parents e2e4289 + 3f4a4e0
commit bdccf59
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/src/ObjectArray.php b/src/ObjectArray.php
@@ -42,10 +42,10 @@ class ObjectArray implements Countable, ArrayAccess, Iterator
     public function __construct(string $type, iterable $objects = [])
     {
         $this->type = $type;
+        $this->iterator = new ArrayIterator();
         foreach ($objects as $object) {
-            $this->validateObjectType($object);
+            $this->add($object);
         }
-        $this->iterator = new ArrayIterator($objects);
     }
 
     /**

diff --git a/tests/Unit/ObjectArrayTest.php b/tests/Unit/ObjectArrayTest.php
@@ -10,10 +10,12 @@
 
 namespace MSlwk\TypeSafeArray\Test\Unit;
 
+use ArrayAccess;
 use ArrayIterator;
 use DateTime;
 use DateTimeImmutable;
 use InvalidArgumentException;
+use IteratorAggregate;
 use MSlwk\TypeSafeArray\ObjectArray;
 use PHPUnit\Framework\TestCase;
 
@@ -121,12 +123,48 @@ public function testAddingWrongTypeViaArrayAccess(): void
      */
     public function provideDifferentIterables(): array
     {
+        $iteratorAggregate = new class() implements IteratorAggregate, ArrayAccess {
+            private $innerIterator;
+            public function __construct()
+            {
+                $this->innerIterator = new ArrayIterator();
+            }
+
+            public function getIterator(): ArrayIterator
+            {
+                return $this->innerIterator;
+            }
+
+            public function offsetExists($offset): bool
+            {
+                return $this->innerIterator->offsetExists($offset);
+            }
+
+            public function offsetGet($offset)
+            {
+                return $this->innerIterator->offsetGet($offset);
+            }
+
+            public function offsetSet($offset, $value): void
+            {
+                $this->innerIterator->offsetSet($offset, $value);
+            }
+
+            public function offsetUnset($offset): void
+            {
+                $this->innerIterator->offsetUnset($offset);
+            }
+        };
+
         return [
             'plain_array' => [
                 []
             ],
             'iterator' => [
                 new ArrayIterator()
+            ],
+            'iterator-aggregate' => [
+                $iteratorAggregate
             ]
         ];
     }