Improving EAVReaderTask with proper iterator initialization

Author: VincentChalnot

Task/EAVReaderTask.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * This file is part of the CleverAge/EAVProcessBundle package.
  *
@@ -34,7 +35,7 @@ class EAVReaderTask extends AbstractEAVQueryTask implements IterableTaskInterfac
     /** @var LoggerInterface */
     protected $logger;
 
-    /** @var \Iterator */
+    /** @var \Iterator|\Countable */
     protected $iterator;
 
     /** @var bool */
@@ -82,20 +83,14 @@ public function execute(ProcessState $state): void
             }
         }
 
+        $init = false;
         if (null === $this->iterator) {
-            $paginator = $this->getPaginator($state);
-            $this->iterator = $paginator->getIterator();
-
-            // Log the data count
-            if ($this->getOption($state, 'log_count')) {
-                $count = \count($paginator);
-                $logContext = $this->getLogContext($state);
-                $this->logger->info("{$count} items found with current query", $logContext);
-            }
+            $this->initIterator($state);
+            $init = true;
         }
 
         // Handle empty results
-        if (0 === $this->iterator->count()) {
+        if ($init && !$this->iterator->valid()) {
             $logContext = $this->getLogContext($state);
             $this->logger->log($options['empty_log_level'], 'Empty resultset for query', $logContext);
             $state->setSkipped(true);
@@ -184,4 +179,20 @@ protected function getLogContext(ProcessState $state): array
 
         return $logContext;
     }
+
+    /**
+     * @param ProcessState $state
+     */
+    protected function initIterator(ProcessState $state): void
+    {
+        $paginator = $this->getPaginator($state);
+        $this->iterator = $paginator->getIterator();
+
+        // Log the data count
+        if ($this->getOption($state, 'log_count')) {
+            $count = $paginator->count();
+            $logContext = $this->getLogContext($state);
+            $this->logger->info("{$count} items found with current query", $logContext);
+        }
+    }
 }