feat(eloquent): IteratorImpl (= all iterators) will implement `Coun…

…table`.
LastDragon-ru · Dec 4, 2022 · f5a1373 · f5a1373
1 parent 8601470
commit f5a1373
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/packages/eloquent/src/Iterators/ChunkedChangeSafeIterator.php b/packages/eloquent/src/Iterators/ChunkedChangeSafeIterator.php
@@ -44,7 +44,7 @@ public function __construct(Builder $builder, string $column = null) {
         // it just adds conditional to the main query, and this leads to an
         // infinite loop.
         if ($this->hasUnions()) {
-            throw new InvalidArgumentException('Queries with UNION is not supported.');
+            throw new InvalidArgumentException('Query with UNION is not supported.');
         }
     }
 

diff --git a/packages/eloquent/src/Iterators/ChunkedChangeSafeIteratorTest.php b/packages/eloquent/src/Iterators/ChunkedChangeSafeIteratorTest.php
@@ -29,6 +29,7 @@ class ChunkedChangeSafeIteratorTest extends TestCase {
      * @covers ::getIterator
      * @covers ::getOffset
      * @covers ::getIndex
+     * @covers ::count
      */
     public function testGetIterator(): void {
         TestObject::factory()->create(['value' => '1']);
@@ -74,6 +75,7 @@ public function testGetIterator(): void {
 
         self::assertEquals(count($expected), $iterator->getIndex());
         self::assertEquals(count($expected), $iterator->getOffset());
+        self::assertEquals(4, count($iterator));
 
         $spyBefore
             ->shouldHaveBeenCalled()
@@ -133,7 +135,7 @@ public function testGetIteratorEloquentDefaults(string $column): void {
      * @covers ::getIterator
      */
     public function testGetIteratorUnion(): void {
-        self::expectExceptionObject(new InvalidArgumentException('Queries with UNION is not supported.'));
+        self::expectExceptionObject(new InvalidArgumentException('Query with UNION is not supported.'));
 
         new ChunkedChangeSafeIterator(TestObject::query()->union(TestObject::query()->toBase()));
     }

diff --git a/packages/eloquent/src/Iterators/ChunkedIteratorTest.php b/packages/eloquent/src/Iterators/ChunkedIteratorTest.php
@@ -23,6 +23,7 @@ class ChunkedIteratorTest extends TestCase {
      * @covers ::getIterator
      * @covers ::getOffset
      * @covers ::getIndex
+     * @covers ::count
      */
     public function testGetIterator(): void {
         TestObject::factory()->create(['value' => '1']);
@@ -50,6 +51,7 @@ public function testGetIterator(): void {
         self::assertEquals(2, count($log) - $count);
         self::assertEquals(count($expected), $iterator->getIndex());
         self::assertEquals(count($expected), $iterator->getOffset());
+        self::assertEquals(3, count($iterator));
 
         $spyBefore
             ->shouldHaveBeenCalled()

diff --git a/packages/eloquent/src/Iterators/IteratorImpl.php b/packages/eloquent/src/Iterators/IteratorImpl.php
@@ -3,12 +3,14 @@
 namespace LastDragon_ru\LaraASP\Eloquent\Iterators;
 
 use Closure;
+use Countable;
 use EmptyIterator;
 use Generator;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use LastDragon_ru\LaraASP\Core\Observer\Dispatcher;
 
+use function max;
 use function min;
 
 /**
@@ -18,7 +20,7 @@
  *
  * @internal
  */
-abstract class IteratorImpl implements Iterator {
+abstract class IteratorImpl implements Iterator, Countable {
     /**
      * @var Dispatcher<Collection<array-key,TItem>>
      */
@@ -191,4 +193,8 @@ protected function getDefaultOffset(): ?int {
     protected function getBuilder(): Builder {
         return $this->builder;
     }
+
+    public function count(): int {
+        return max(0, $this->getBuilder()->toBase()->count());
+    }
 }