Merge pull request #5279 from Laravel-Backpack/throw-error-when-missing-subfields

Improve subfields errors on handling

Author: pxpm

src/app/Library/CrudPanel/Traits/FieldsProtectedMethods.php

@@ -254,13 +254,17 @@ protected function inferFieldTypeFromRelationType($relationType)
      */
     protected function makeSureSubfieldsHaveNecessaryAttributes($field)
     {
-        if (! isset($field['subfields'])) {
+        if (! isset($field['subfields']) || ! is_array($field['subfields'])) {
             return $field;
         }
 
+        if (! is_multidimensional_array($field['subfields'], true)) {
+            abort(500, 'Subfields of «'.$field['name'].'» are malformed. Make sure you provide an array of subfields.');
+        }
+
         foreach ($field['subfields'] as $key => $subfield) {
             if (empty($subfield) || ! isset($subfield['name'])) {
-                abort(500, 'Subfield name can\'t be empty');
+                abort(500, 'A subfield of «'.$field['name'].'» is malformed. Subfield attribute name can\'t be empty.');
             }
 
             // make sure the field definition is an array

src/helpers.php

@@ -365,20 +365,22 @@ function old_empty_or_null($key, $empty_value = '')
 
 if (! function_exists('is_multidimensional_array')) {
     /**
-     * If any of the items inside a given array is an array, the array is considered multidimensional.
+     * Check if the array is multidimensional.
      *
-     * @param  array  $array
-     * @return bool
+     * If $strict is enabled, the array is considered multidimensional only if all elements of the array are arrays.
      */
-    function is_multidimensional_array(array $array)
+    function is_multidimensional_array(array $array, bool $strict = false): bool
     {
         foreach ($array as $item) {
-            if (is_array($item)) {
+            if ($strict && ! is_array($item)) {
+                return false;
+            }
+            if (! $strict && is_array($item)) {
                 return true;
             }
         }
 
-        return false;
+        return $strict;
     }
 }