z-song / laravel-admin

src/Form/Field/HasMany.php

Spacing +16 added lines, -16 removed lines

@@ -15,7 +15,7 @@ 
     {
         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))
         );
@@ -47,7 +47,7 @@ 
 if (!function_exists('Encore\Admin\Form\Field\array_key_clean')) {
     function array_key_clean(array $a)
     {
-        $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
+        $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;
 
@@ -151,7 +151,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);
@@ -178,15 +178,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) {
+                $newRules = array_map(function($v) use ($availInput, $field) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationRules([$field->column() => $availInput[$k][$c]]);
@@ -195,7 +195,7 @@ 
                 }, $newColumn);
                 $rules = array_clean_merge($rules, array_filter($newRules));
 
-                $newAttributes = array_map(function ($v) use ($availInput, $field) {
+                $newAttributes = array_map(function($v) use ($availInput, $field) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationAttributes([$field->column() => $availInput[$k][$c]]);
@@ -204,7 +204,7 @@ 
                 }, $newColumn);
                 $attributes = array_clean_merge($attributes, array_filter($newAttributes));
 
-                $newInput = array_map(function ($v) use ($availInput, $field) {
+                $newInput = array_map(function($v) use ($availInput, $field) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationInput([$field->column() => $availInput[$k][$c]]);
@@ -213,7 +213,7 @@ 
                 }, $newColumn);
                 $newInputs = array_clean_merge($newInputs, array_filter($newInput, 'strlen', ARRAY_FILTER_USE_KEY));
 
-                $newMessages = array_map(function ($v) use ($availInput, $field) {
+                $newMessages = array_map(function($v) use ($availInput, $field) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationMessages([$field->column() => $availInput[$k][$c]]);
@@ -223,7 +223,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) {
+                $newRules = array_map(function($v) use ($fieldRules, $availInput) {
                     list($r, $k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
@@ -235,7 +235,7 @@ 
                 }, $newColumn);
                 $rules = array_clean_merge($rules, $newRules);
 
-                $newInput = array_map(function ($v) use ($availInput) {
+                $newInput = array_map(function($v) use ($availInput) {
                     list($r, $k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
@@ -251,12 +251,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].']' : '';
@@ -275,12 +275,12 @@ 
             }
 
             if ($field->validationMessages) {
-                $newMessages = array_map(function ($v) use ($field, $availInput) {
+                $newMessages = 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) {
                             return array_key_attach_str($field->validationMessages, "{$v}:{$u}");
                         }, array_keys($availInput[$k][$col])));
                     }
@@ -688,7 +688,7 @@ 
         }
 
         /* Build row elements */
-        $template = array_reduce($fields, function ($all, $field) {
+        $template = array_reduce($fields, function($all, $field) {
             $all .= "<td>{$field}</td>";
 
             return $all;

src/Form/Field/Embeds.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Encore\Admin\Form\EmbeddedForm;
 use Encore\Admin\Form\Field;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Str;
 
 if (!function_exists('Encore\Admin\Form\Field\array_key_attach_str')) {
     function array_key_attach_str(array $a, string $b, string $c = '.')

Spacing +16 added lines, -16 removed lines

@@ -12,7 +12,7 @@ 
     {
         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))
         );
@@ -44,7 +44,7 @@ 
 if (!function_exists('Encore\Admin\Form\Field\array_key_clean')) {
     function array_key_clean(array $a)
     {
-        $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
+        $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;
 
@@ -157,13 +157,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];
@@ -244,20 +244,20 @@ 
              *      '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] . ']' : '';
+                        $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
 
                         return ["{$v}:{$u}" => $w];
                     }, array_keys($availInput[$k][$col])));
@@ -266,7 +266,7 @@ 
                 //May Have Problem in Dealing with File Upload in Edit Mode
                 $w = $field->label();
                 //Fix ResetInput Function! A Headache Implementation!
-                $w .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[2])[0] . ']' : '';
+                $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
 
                 return [$v => $w];
             }, $newColumn);
@@ -333,12 +333,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) {
+            $newInput = array_map(function($v) use ($availInput) {
                 list($k, $c) = explode('.', $v);
                 //Fix ResetInput Function! A Headache Implementation!
                 $col = explode(':', $c)[0];
@@ -396,20 +396,20 @@ 
                 $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) {
+                $newMessages = 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 (
+                            array_map(function($u) use (
                                 $v,
                                 $field
                             ) {
@@ -477,7 +477,7 @@ 
             return json_decode($this->value, true);
         }
 
-        return (array)$this->value;
+        return (array) $this->value;
     }
 
     /**
@@ -496,7 +496,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)) {