Merge pull request #1589 from craftcms/bugfix/1585-tweaks

tweaks for 1585

Author: angrybrad

src/fields/Categories.php

@@ -253,7 +253,7 @@ public static function getMatchFields(FeedModel $feed, ?BaseRelationField $field
             }
             // otherwise get the layout for the group selected in the field's settings
             return array_filter(
-                FieldHelper::getElementLayoutByField($field::class, $field),
+                FieldHelper::getElementLayoutByField($field::class, $field) ?? [],
                 fn($field) => FieldHelper::fieldCanBeUniqueId($field)
             );
         }

src/fields/Entries.php

@@ -298,7 +298,10 @@ public static function getMatchFields(FeedModel $feed, ?BaseRelationField $field
             }
 
             // if there's a custom source in the mix, we should add all the fields too
-            $customSources = array_filter($field['sources'], (fn(string $source) => str_starts_with($source, 'custom:')));
+            $customSources = [];
+            if (is_array($field['sources'])) {
+                $customSources = array_filter($field['sources'], (fn(string $source) => str_starts_with($source, 'custom:')));
+            }
 
             if (!empty($customSources)) {
                 $allowedFields = [...$allowedFields, ...Craft::$app->getFields()->getAllFields()];

src/fields/Users.php

@@ -222,7 +222,7 @@ public function parseField(): mixed
      */
     public static function getMatchFields(FeedModel $feed, ?BaseRelationField $field = null): array
     {
-        return array_filter(FieldHelper::getUserLayoutByField(), fn($field) => FieldHelper::fieldCanBeUniqueId($field));
+        return array_filter(FieldHelper::getUserLayoutByField() ?? [], fn($field) => FieldHelper::fieldCanBeUniqueId($field));
     }
 
     // Private Methods