Merge branch '5.x' into 6.x

# Conflicts:
#	CHANGELOG.md

Author: angrybrad

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Release Notes for Feed Me
 
-## 6.8.0 - 2025-03-14
+## Unreleased
+
+- Fixed an error that could occur when running a feed with nothing to process. ([#1611](https://github.com/craftcms/feed-me/pull/1611))
 
+## 6.8.0 - 2025-03-14
+- 
 - Added support for Craft’s batched queue jobs, so that long-running feeds can be processed in batches. ([#1598](https://github.com/craftcms/feed-me/pull/1598))
 - Improved support for importing into Time fields. ([#1595](https://github.com/craftcms/feed-me/pull/1595))
 - Fixed a PHP error that could occur with some plugins that were installed, but Feed Me doesn't support. ([#1596](https://github.com/craftcms/feed-me/pull/1596))

src/datatypes/Csv.php

@@ -112,7 +112,10 @@ public function getFeed($url, $settings, bool $usePrimaryElement = true): array
             $array = Plugin::$plugin->data->findPrimaryElement($primaryElement, $array);
         }
 
-        $this->feedData = $array;
+        if ($array) {
+            $this->feedData = $array;
+        }
+
         return ['success' => true, 'data' => $array];
     }
 

src/datatypes/GoogleSheet.php

@@ -87,7 +87,10 @@ public function getFeed($url, $settings, bool $usePrimaryElement = true): array
             $array = Plugin::$plugin->data->findPrimaryElement($primaryElement, $array);
         }
 
-        $this->feedData = $array;
+        if ($array) {
+            $this->feedData = $array;
+        }
+
         return ['success' => true, 'data' => $array];
     }
 }

src/datatypes/Json.php

@@ -85,7 +85,10 @@ public function getFeed($url, $settings, bool $usePrimaryElement = true): array
             $array = Plugin::$plugin->data->findPrimaryElement($primaryElement, $array);
         }
 
-        $this->feedData = $array;
+        if ($array) {
+            $this->feedData = $array;
+        }
+
         return ['success' => true, 'data' => $array];
     }
 }

src/datatypes/Xml.php

@@ -83,7 +83,10 @@ public function getFeed($url, $settings, bool $usePrimaryElement = true): array
             $array = Plugin::$plugin->data->findPrimaryElement($primaryElement, $array);
         }
 
-        $this->feedData = $array;
+        if ($array) {
+            $this->feedData = $array;
+        }
+
         return ['success' => true, 'data' => $array];
     }
 }

src/queue/jobs/FeedImport.php

@@ -93,6 +93,11 @@ protected function loadData(): Batchable
     {
         $feedData = $this->feed->getFeedData();
 
+        // Do we even have any data to process?
+        if (!$feedData) {
+            return new DataBatcher([]);
+        }
+
         if ($this->offset) {
             $feedData = array_slice($feedData, $this->offset);
         }
@@ -158,16 +163,23 @@ protected function processItem(mixed $item): void
     public function execute($queue): void
     {
         $processService = Plugin::$plugin->getProcess();
+        $data = array_filter((array)$this->data());
+
+        if (empty($data)) {
+            Plugin::info('No feed items to process.');
+            return;
+        }
+
         if ($this->itemOffset == 0) {
-            $processService->beforeProcessFeed($this->feed, (array)$this->data());
+            $processService->beforeProcessFeed($this->feed, $data);
         }
 
         if (!$this->startTime) {
             $this->startTime = $processService->time_start;
         }
 
         if (empty($this->_feedSettings)) {
-            $this->_feedSettings = $processService->getFeedSettings($this->feed, (array)$this->data());
+            $this->_feedSettings = $processService->getFeedSettings($this->feed, $data);
         }
 
         parent::execute($queue);