z-song / laravel-admin

src/Form/Field/HasMany.php

Spacing +19 added lines, -19 removed lines

@@ -100,28 +100,28 @@ 
             return false;
         }
 
-        $array_key_attach_str = function (array $a, string $b, string $c = '.') {
+        $array_key_attach_str = function(array $a, string $b, string $c = '.') {
             return call_user_func_array(
                 'array_merge',
-                array_map(function ($u, $v) use ($b, $c) {
+                array_map(function($u, $v) use ($b, $c) {
                     return ["{$b}{$c}{$u}" => $v];
                 }, array_keys($a), array_values($a))
             );
         };
 
-        $array_key_clean = function (array $a) {
-            $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
+        $array_key_clean = function(array $a) {
+            $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) {
                 return [str_replace(':', '', $k) => $v];
             }, array_keys($a), array_values($a))) : $a;
 
             return $a;
         };
 
-        $array_clean_merge = function (array $a, $b) {
+        $array_clean_merge = function(array $a, $b) {
             return $b ? array_merge($a, call_user_func_array('array_merge', $b)) : $a;
         };
 
-        $array_key_clean_undot = function (array $a) {
+        $array_key_clean_undot = function(array $a) {
             $keys = preg_grep('/[\.\:]/', array_keys($a));
             if ($keys) {
                 foreach ($keys as $key) {
@@ -137,7 +137,7 @@ 
         $rel = $this->relationName;
         $rules = $attributes = $messages = $newInputs = [];
         // remove all inputs & keys marked as removed
-        $availInput = array_filter(array_map(function ($v) {
+        $availInput = array_filter(array_map(function($v) {
             return $v[NestedForm::REMOVE_FLAG_NAME] ? null : $v;
         }, $input[$rel]));
         $keys = array_keys($availInput);
@@ -157,15 +157,15 @@ 
                 }
             }
 
-            $newColumn = call_user_func_array('array_merge', array_map(function ($u) use ($columns, $rel) {
-                return array_map(function ($k, $v) use ($u, $rel) {
+            $newColumn = call_user_func_array('array_merge', array_map(function($u) use ($columns, $rel) {
+                return array_map(function($k, $v) use ($u, $rel) {
                     //Fix ResetInput Function! A Headache Implementation!
                     return $k ? "{$rel}.{$u}.{$v}:{$k}" : "{$rel}.{$u}.{$v}";
                 }, array_keys($columns), array_values($columns));
             }, $keys));
 
             if ($field instanceof Field\Embeds) {
-                $newRules = array_map(function ($v) use ($availInput, $field, $array_key_attach_str) {
+                $newRules = array_map(function($v) use ($availInput, $field, $array_key_attach_str) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationRules([$field->column() => $availInput[$k][$c]]);
@@ -174,7 +174,7 @@ 
                 }, $newColumn);
                 $rules = $array_clean_merge($rules, array_filter($newRules));
 
-                $newAttributes = array_map(function ($v) use ($availInput, $field, $array_key_attach_str) {
+                $newAttributes = array_map(function($v) use ($availInput, $field, $array_key_attach_str) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationAttributes([$field->column() => $availInput[$k][$c]]);
@@ -183,7 +183,7 @@ 
                 }, $newColumn);
                 $attributes = $array_clean_merge($attributes, array_filter($newAttributes));
 
-                $newInput = array_map(function ($v) use ($availInput, $field, $array_key_attach_str) {
+                $newInput = array_map(function($v) use ($availInput, $field, $array_key_attach_str) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationInput([$field->column() => $availInput[$k][$c]]);
@@ -192,7 +192,7 @@ 
                 }, $newColumn);
                 $newInputs = $array_clean_merge($newInputs, array_filter($newInput, 'strlen', ARRAY_FILTER_USE_KEY));
 
-                $newMessages = array_map(function ($v) use ($availInput, $field, $array_key_attach_str) {
+                $newMessages = array_map(function($v) use ($availInput, $field, $array_key_attach_str) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationMessages([$field->column() => $availInput[$k][$c]]);
@@ -202,7 +202,7 @@ 
                 $messages = $array_clean_merge($messages, array_filter($newMessages));
             } else {
                 $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
-                $newRules = array_map(function ($v) use ($fieldRules, $availInput, $array_key_attach_str) {
+                $newRules = array_map(function($v) use ($fieldRules, $availInput, $array_key_attach_str) {
                     list($r, $k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
@@ -214,7 +214,7 @@ 
                 }, $newColumn);
                 $rules = $array_clean_merge($rules, $newRules);
 
-                $newInput = array_map(function ($v) use ($availInput, $array_key_attach_str) {
+                $newInput = array_map(function($v) use ($availInput, $array_key_attach_str) {
                     list($r, $k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
@@ -230,12 +230,12 @@ 
                 }, $newColumn);
                 $newInputs = $array_clean_merge($newInputs, $newInput);
 
-                $newAttributes = array_map(function ($v) use ($field, $availInput) {
+                $newAttributes = array_map(function($v) use ($field, $availInput) {
                     list($r, $k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
-                        return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) {
+                        return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) {
                             $w = $field->label();
                             //Fix ResetInput Function! A Headache Implementation!
                             $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
@@ -254,12 +254,12 @@ 
             }
 
             if ($field->validationMessages) {
-                $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) {
+                $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) {
                     list($r, $k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
-                        return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field, $array_key_attach_str) {
+                        return call_user_func_array('array_merge', array_map(function($u) use ($v, $field, $array_key_attach_str) {
                             return $array_key_attach_str($field->validationMessages, "{$v}:{$u}");
                         }, array_keys($availInput[$k][$col])));
                     }

src/Form/Field/Embeds.php

Spacing +26 added lines, -26 removed lines

@@ -61,16 +61,16 @@ 
         $rules = $attributes = $messages = $newInputs = [];
         $rel = $this->column;
         $availInput = $input;
-        $array_key_attach_str = function (array $a, string $b, string $c = '.') {
+        $array_key_attach_str = function(array $a, string $b, string $c = '.') {
             return call_user_func_array(
                 'array_merge',
-                array_map(function ($u, $v) use ($b, $c) {
+                array_map(function($u, $v) use ($b, $c) {
                     return ["{$b}{$c}{$u}" => $v];
                 }, array_keys($a), array_values($a))
             );
         };
 
-        $array_clean_merge = function (array $a, $b) {
+        $array_clean_merge = function(array $a, $b) {
             return $b ? array_merge($a, call_user_func_array('array_merge', $b)) : $a;
         };
 
@@ -113,13 +113,13 @@ 
              *      'extra.end_atend'     => "$label[end_at]"
              * ]
              */
-            $newColumn = array_map(function ($k, $v) use ($rel) {
+            $newColumn = array_map(function($k, $v) use ($rel) {
                 //Fix ResetInput Function! A Headache Implementation!
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
             }, array_keys($columns), array_values($columns));
 
             $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
-            $newRules = array_map(function ($v) use ($fieldRules, $availInput) {
+            $newRules = array_map(function($v) use ($fieldRules, $availInput) {
                 list($k, $c) = explode('.', $v);
                 //Fix ResetInput Function! A Headache Implementation!
                 $col = explode(':', $c)[0];
@@ -150,16 +150,16 @@ 
         $rules = $attributes = $messages = $newInputs = [];
         $rel = $this->column;
         $availInput = $input;
-        $array_key_attach_str = function (array $a, string $b, string $c = '.') {
+        $array_key_attach_str = function(array $a, string $b, string $c = '.') {
             return call_user_func_array(
                 'array_merge',
-                array_map(function ($u, $v) use ($b, $c) {
+                array_map(function($u, $v) use ($b, $c) {
                     return ["{$b}{$c}{$u}" => $v];
                 }, array_keys($a), array_values($a))
             );
         };
 
-        $array_clean_merge = function (array $a, $b) {
+        $array_clean_merge = function(array $a, $b) {
             return $b ? array_merge($a, call_user_func_array('array_merge', $b)) : $a;
         };
 
@@ -202,17 +202,17 @@ 
              *      'extra.end_atend'     => "$label[end_at]"
              * ]
              */
-            $newColumn = array_map(function ($k, $v) use ($rel) {
+            $newColumn = array_map(function($k, $v) use ($rel) {
                 //Fix ResetInput Function! A Headache Implementation!
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
             }, array_keys($columns), array_values($columns));
 
-            $newAttributes = array_map(function ($v) use ($field, $availInput) {
+            $newAttributes = array_map(function($v) use ($field, $availInput) {
                 list($k, $c) = explode('.', $v);
                 //Fix ResetInput Function! A Headache Implementation!
                 $col = explode(':', $c)[0];
                 if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
-                    return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) {
+                    return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) {
                         $w = $field->label();
                         //Fix ResetInput Function! A Headache Implementation!
                         $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
@@ -247,16 +247,16 @@ 
         $rules = $attributes = $messages = $newInputs = [];
         $rel = $this->column;
         $availInput = $input;
-        $array_key_attach_str = function (array $a, string $b, string $c = '.') {
+        $array_key_attach_str = function(array $a, string $b, string $c = '.') {
             return call_user_func_array(
                 'array_merge',
-                array_map(function ($u, $v) use ($b, $c) {
+                array_map(function($u, $v) use ($b, $c) {
                     return ["{$b}{$c}{$u}" => $v];
                 }, array_keys($a), array_values($a))
             );
         };
 
-        $array_clean_merge = function (array $a, $b) {
+        $array_clean_merge = function(array $a, $b) {
             return $b ? array_merge($a, call_user_func_array('array_merge', $b)) : $a;
         };
 
@@ -292,12 +292,12 @@ 
              *     'extra.end_atend' => $value
              * ]
              */
-            $newColumn = array_map(function ($k, $v) use ($rel) {
+            $newColumn = array_map(function($k, $v) use ($rel) {
                 //Fix ResetInput Function! A Headache Implementation!
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
             }, array_keys($columns), array_values($columns));
 
-            $newInput = array_map(function ($v) use ($availInput, $array_key_attach_str) {
+            $newInput = array_map(function($v) use ($availInput, $array_key_attach_str) {
                 list($k, $c) = explode('.', $v);
                 //Fix ResetInput Function! A Headache Implementation!
                 $col = explode(':', $c)[0];
@@ -330,16 +330,16 @@ 
         $rules = $attributes = $messages = $newInputs = [];
         $rel = $this->column;
         $availInput = $input;
-        $array_key_attach_str = function (array $a, string $b, string $c = '.') {
+        $array_key_attach_str = function(array $a, string $b, string $c = '.') {
             return call_user_func_array(
                 'array_merge',
-                array_map(function ($u, $v) use ($b, $c) {
+                array_map(function($u, $v) use ($b, $c) {
                     return ["{$b}{$c}{$u}" => $v];
                 }, array_keys($a), array_values($a))
             );
         };
 
-        $array_clean_merge = function (array $a, $b) {
+        $array_clean_merge = function(array $a, $b) {
             return $b ? array_merge($a, call_user_func_array('array_merge', $b)) : $a;
         };
 
@@ -356,18 +356,18 @@ 
                 $availInput[$column] = $availInput[$column] ?: null;
             }
 
-            $newColumn = array_map(function ($k, $v) use ($rel) {
+            $newColumn = array_map(function($k, $v) use ($rel) {
                 //Fix ResetInput Function! A Headache Implementation!
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
             }, array_keys($columns), array_values($columns));
 
             if ($field->validationMessages) {
-                $newMessages = array_map(function ($v) use ($field, $availInput, $array_key_attach_str) {
+                $newMessages = array_map(function($v) use ($field, $availInput, $array_key_attach_str) {
                     list($k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
-                        return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field, $array_key_attach_str) {
+                        return call_user_func_array('array_merge', array_map(function($u) use ($v, $field, $array_key_attach_str) {
                             return $array_key_attach_str($field->validationMessages, "{$v}:{$u}");
                         }, array_keys($availInput[$k][$col])));
                     }
@@ -396,7 +396,7 @@ 
             return false;
         }
 
-        $array_key_clean_undot = function (array $a) {
+        $array_key_clean_undot = function(array $a) {
             $keys = preg_grep('/[\.\:]/', array_keys($a));
             if ($keys) {
                 foreach ($keys as $key) {
@@ -408,8 +408,8 @@ 
             return $a;
         };
 
-        $array_key_clean = function (array $a) {
-            $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
+        $array_key_clean = function(array $a) {
+            $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) {
                 return [str_replace(':', '', $k) => $v];
             }, array_keys($a), array_values($a))) : $a;
 
@@ -474,7 +474,7 @@ 
         //Fix the Bug of Embeds Fields Cannot be used within HasMany
         if ($this->elementName) {
             list($rel, $key, $col) = explode('.', $this->errorKey);
-            $form->fields()->each(function (Field $field) use ($rel,$key,$col) {
+            $form->fields()->each(function(Field $field) use ($rel, $key, $col) {
                 $column = $field->column();
                 $elementName = $elementClass = $errorKey = [];
                 if (is_array($column)) {