z-song / laravel-admin

src/Form/Field/Embeds.php

Spacing +22 added lines, -22 removed lines

@@ -64,23 +64,23 @@ 
 
 
         $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_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_key_clean_undot = function (array $a) {
+        $array_key_clean_undot = function(array $a) {
             if (count($a))
                 foreach ($a as $key => $val) {
                 array_set($a, str_replace(':', '', $key), $val);
@@ -101,7 +101,7 @@ 
             $columns = is_array($column) ? $column : [$column];
             if ($field instanceof Field\MultipleSelect) {
                 $availInput[$column] = array_filter($availInput[$column], 'strlen');
-                $availInput[$column] = $availInput[$column] ? : null;
+                $availInput[$column] = $availInput[$column] ?: null;
             }
             /*
              *
@@ -123,7 +123,7 @@ 
              *     'extra.end_atend' => 'required'
              * ]
              */
-            $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));
@@ -131,22 +131,22 @@ 
             $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
             $rules = array_merge($rules, call_user_func_array(
                 'array_merge',
-                array_map(function ($v) use ($fieldRules) {
+                array_map(function($v) use ($fieldRules) {
                     return [$v => $fieldRules];
                 }, $newColumn)
             ));
             $attributes = array_merge($attributes, call_user_func_array(
                 'array_merge',
-                array_map(function ($v) use ($field) {
+                array_map(function($v) use ($field) {
                     //Fix ResetInput Function! A Headache Implementation!
                     $u = $field->label();
-                    $u .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[1])[0] . ']' : '';
+                    $u .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[1])[0].']' : '';
                     return [$v => "{$u}"];
                 }, $newColumn)
             ));
             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($rel, $col) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col1 = explode(':', $col)[0];
@@ -169,13 +169,13 @@ 
         if (empty($rules)) {
             return false;
         }
-        $newInput = call_user_func_array('array_merge', array_map(function ($idx) use ($availInput) {
+        $newInput = call_user_func_array('array_merge', array_map(function($idx) use ($availInput) {
             list($rel, $col) = explode('.', $idx);
             //Fix ResetInput Function! A Headache Implementation!
             $col1 = explode(':', $col)[0];
             if (!array_key_exists($col1, $availInput[$rel])) return [null => null];
             if (is_array($availInput[$rel][$col1])) {
-                return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) {
+                return call_user_func_array('array_merge', array_map(function($x, $y) use ($idx) {
                     return ["{$idx}{$x}" => $y];
                 }, array_keys($availInput[$rel][$col1]), $availInput[$rel][$col1]));
             }
@@ -183,13 +183,13 @@ 
         }, array_keys($rules)));
 
         $newInput = $array_key_clean_undot($newInput);
-        $newRules = array_map(function ($idx) use ($availInput, $rules) {
+        $newRules = array_map(function($idx) use ($availInput, $rules) {
             list($rel, $col) = explode('.', $idx);
             //Fix ResetInput Function! A Headache Implementation!
             $col1 = explode(':', $col)[0];
             if (!array_key_exists($col1, $availInput[$rel])) return [null => null];
             if (is_array($availInput[$rel][$col1])) {
-                return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) {
+                return call_user_func_array('array_merge', array_map(function($x) use ($idx, $rules) {
                     return ["{$idx}{$x}" => $rules[$idx]];
                 }, array_keys($availInput[$rel][$col1])));
             }
@@ -197,16 +197,16 @@ 
 
         }, array_keys($rules));
         $newRules = array_filter(call_user_func_array('array_merge', $newRules), 'strlen', ARRAY_FILTER_USE_KEY);
-        $newRules = $array_key_clean($newRules);;
+        $newRules = $array_key_clean($newRules); ;
 
-        $newAttributes = array_map(function ($idx) use ($availInput, $attributes) {
+        $newAttributes = array_map(function($idx) use ($availInput, $attributes) {
             list($rel, $col) = explode('.', $idx);
             //Fix ResetInput Function! A Headache Implementation!
             $col1 = explode(':', $col)[0];
             if (!array_key_exists($col1, $availInput[$rel])) return [null => null];
             if (is_array($availInput[$rel][$col1])) {
                 if (array_keys($availInput[$rel][$col1]))
-                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
+                    return call_user_func_array('array_merge', array_map(function($x) use ($idx, $attributes) {
                     return ["{$idx}.{$x}" => $attributes[$idx]];
                 }, array_keys($availInput[$rel][$col1])));
                 return [null => null];
@@ -242,7 +242,7 @@ 
 
         if (is_array($column)) {
             foreach ($column as $index => $col) {
-                $new[$col . $index] = $col;
+                $new[$col.$index] = $col;
             }
         }
 
@@ -254,7 +254,7 @@ 
             } else {
                 foreach ($new as $k => $val) {
                     if (Str::endsWith($key, ".$k")) {
-                        $attributes[$key] = $label . "[$val]";
+                        $attributes[$key] = $label."[$val]";
                     }
                 }
             }
@@ -280,7 +280,7 @@ 
                 continue;
             }
 
-            $newKey = $key . $column[$key];
+            $newKey = $key.$column[$key];
 
             /*
              * set new key
@@ -316,7 +316,7 @@ 
             return json_decode($this->value, true);
         }
 
-        return (array)$this->value;
+        return (array) $this->value;
     }
 
     /**

Braces +21 added lines, -10 removed lines

@@ -81,9 +81,10 @@ 
         };
 
         $array_key_clean_undot = function (array $a) {
-            if (count($a))
-                foreach ($a as $key => $val) {
+            if (count($a)) {
+                            foreach ($a as $key => $val) {
                 array_set($a, str_replace(':', '', $key), $val);
+            }
                 if (preg_match('/[\.\:]/', $key)) {
                     unset($a[$key]);
                 }
@@ -150,10 +151,13 @@ 
                     list($rel, $col) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col1 = explode(':', $col)[0];
-                    if (!array_key_exists($col1, $availInput[$rel])) return [null => null];
+                    if (!array_key_exists($col1, $availInput[$rel])) {
+                        return [null => null];
+                    }
                     $rows = $availInput[$rel][$col1];
-                    if (!is_array($rows))
-                        return $array_key_attach_str($field->validationMessages, $v);
+                    if (!is_array($rows)) {
+                                            return $array_key_attach_str($field->validationMessages, $v);
+                    }
                     $r = [];
                     foreach (array_keys($rows) as $k) {
                         $k = "{$v}{$k}";
@@ -173,7 +177,9 @@ 
             list($rel, $col) = explode('.', $idx);
             //Fix ResetInput Function! A Headache Implementation!
             $col1 = explode(':', $col)[0];
-            if (!array_key_exists($col1, $availInput[$rel])) return [null => null];
+            if (!array_key_exists($col1, $availInput[$rel])) {
+                return [null => null];
+            }
             if (is_array($availInput[$rel][$col1])) {
                 return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) {
                     return ["{$idx}{$x}" => $y];
@@ -187,7 +193,9 @@ 
             list($rel, $col) = explode('.', $idx);
             //Fix ResetInput Function! A Headache Implementation!
             $col1 = explode(':', $col)[0];
-            if (!array_key_exists($col1, $availInput[$rel])) return [null => null];
+            if (!array_key_exists($col1, $availInput[$rel])) {
+                return [null => null];
+            }
             if (is_array($availInput[$rel][$col1])) {
                 return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) {
                     return ["{$idx}{$x}" => $rules[$idx]];
@@ -203,11 +211,14 @@ 
             list($rel, $col) = explode('.', $idx);
             //Fix ResetInput Function! A Headache Implementation!
             $col1 = explode(':', $col)[0];
-            if (!array_key_exists($col1, $availInput[$rel])) return [null => null];
+            if (!array_key_exists($col1, $availInput[$rel])) {
+                return [null => null];
+            }
             if (is_array($availInput[$rel][$col1])) {
-                if (array_keys($availInput[$rel][$col1]))
-                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
+                if (array_keys($availInput[$rel][$col1])) {
+                                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
                     return ["{$idx}.{$x}" => $attributes[$idx]];
+                }
                 }, array_keys($availInput[$rel][$col1])));
                 return [null => null];
             }

src/Form/Field/HasMany.php

Spacing +24 added lines, -24 removed lines

@@ -101,23 +101,23 @@ 
             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_key_clean_undot = function (array $a) {
+        $array_key_clean_undot = function(array $a) {
             if (count($a))
                 foreach ($a as $key => $val) {
                 array_set($a, str_replace(':', '', $key), $val);
@@ -134,7 +134,7 @@ 
         $rules = $attributes = [];
         $messages = [];
         // 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);
@@ -148,15 +148,15 @@ 
             if ($field instanceof Field\MultipleSelect) {
                 foreach ($keys as $key) {
                     $availInput[$key][$column] = array_filter($availInput[$key][$column], 'strlen');
-                    $availInput[$key][$column] = $availInput[$key][$column] ? : null;
+                    $availInput[$key][$column] = $availInput[$key][$column] ?: null;
                 }
             }
             // if($field instanceof Field\File)
             // {
             //     dd(request());
             // }
-            $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}" : "{$rel}.{$u}.{$v}:{$k}";
                 }, array_keys($columns), array_values($columns));
@@ -165,22 +165,22 @@ 
             $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
             $rules = array_merge($rules, call_user_func_array(
                 'array_merge',
-                array_map(function ($v) use ($fieldRules) {
+                array_map(function($v) use ($fieldRules) {
                     return [$v => $fieldRules];
                 }, $newColumn)
             ));
             $attributes = array_merge($attributes, call_user_func_array(
                 'array_merge',
-                array_map(function ($v) use ($field) {
+                array_map(function($v) use ($field) {
                     //Fix ResetInput Function! A Headache Implementation!
                     $u = $field->label();
-                    $u .= is_array($field->column()) ? '[' . explode(':', explode('.', $v)[1])[0] . ']' : '';
+                    $u .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[1])[0].']' : '';
                     return [$v => "{$u}"];
                 }, $newColumn)
             ));
             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!
                     $col1 = explode(':', $c)[0];
@@ -204,14 +204,14 @@ 
             return false;
         }
 
-        $newInput = call_user_func_array('array_merge', array_map(function ($u) use ($availInput) {
+        $newInput = call_user_func_array('array_merge', array_map(function($u) use ($availInput) {
             list($rel, $key, $col) = explode('.', $u);
             $idx = "{$rel}.{$key}.{$col}";
             //Fix ResetInput Function! A Headache Implementation!
             $col1 = explode(':', $col)[0];
             if (!array_key_exists($col1, $availInput[$key])) return [null => null];
             if (is_array($availInput[$key][$col1])) {
-                return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) {
+                return call_user_func_array('array_merge', array_map(function($x, $y) use ($idx) {
                     return ["{$idx}{$x}" => $y];
                 }, array_keys($availInput[$key][$col1]), $availInput[$key][$col1]));
             }
@@ -219,14 +219,14 @@ 
         }, array_keys($rules)));
         $newInput = $array_key_clean_undot($newInput);
 
-        $newRules = array_map(function ($u) use ($availInput, $rules) {
+        $newRules = array_map(function($u) use ($availInput, $rules) {
             list($rel, $key, $col) = explode('.', $u);
             $idx = "{$rel}.{$key}.{$col}";
             //Fix ResetInput Function! A Headache Implementation!
             $col1 = explode(':', $col)[0];
             if (!array_key_exists($col1, $availInput[$key])) return [null => null];
             if (is_array($availInput[$key][$col1])) {
-                return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) {
+                return call_user_func_array('array_merge', array_map(function($x) use ($idx, $rules) {
                     return ["{$idx}{$x}" => $rules[$idx]];
                 }, array_keys($availInput[$key][$col1])));
             }
@@ -234,9 +234,9 @@ 
 
         }, array_keys($rules));
         $newRules = array_filter(call_user_func_array('array_merge', $newRules), 'strlen', ARRAY_FILTER_USE_KEY);
-        $newRules = $array_key_clean($newRules);;
+        $newRules = $array_key_clean($newRules); ;
 
-        $newAttributes = array_map(function ($u) use ($availInput, $attributes) {
+        $newAttributes = array_map(function($u) use ($availInput, $attributes) {
             list($rel, $key, $col) = explode('.', $u);
             $idx = "{$rel}.{$key}.{$col}";
             //Fix ResetInput Function! A Headache Implementation!
@@ -244,7 +244,7 @@ 
             if (!array_key_exists($col1, $availInput[$key])) return [null => null];
             if (is_array($availInput[$key][$col1])) {
                 if (array_keys($availInput[$key][$col1]))
-                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
+                    return call_user_func_array('array_merge', array_map(function($x) use ($idx, $attributes) {
                     return ["{$idx}.{$x}" => $attributes[$idx]];
                 }, array_keys($availInput[$key][$col1])));
                 return [null => null];
@@ -278,7 +278,7 @@ 
 
         if (is_array($column)) {
             foreach ($column as $index => $col) {
-                $new[$col . $index] = $col;
+                $new[$col.$index] = $col;
             }
         }
 
@@ -290,7 +290,7 @@ 
             } else {
                 foreach ($new as $k => $val) {
                     if (Str::endsWith($key, ".$k")) {
-                        $attributes[$key] = $label . "[$val]";
+                        $attributes[$key] = $label."[$val]";
                     }
                 }
             }
@@ -349,7 +349,7 @@ 
                  *
                  * I don't know why a form need range input? Only can imagine is for range search....
                  */
-                $newKey = $name . $column[$name];
+                $newKey = $name.$column[$name];
 
                 /*
                  * set new key
@@ -501,7 +501,7 @@ 
      */
     protected function setupScript($script)
     {
-        $method = 'setupScriptFor' . ucfirst($this->viewMode) . 'View';
+        $method = 'setupScriptFor'.ucfirst($this->viewMode).'View';
 
         call_user_func([$this, $method], $script);
     }

Braces +21 added lines, -10 removed lines

@@ -118,9 +118,10 @@ 
         };
 
         $array_key_clean_undot = function (array $a) {
-            if (count($a))
-                foreach ($a as $key => $val) {
+            if (count($a)) {
+                            foreach ($a as $key => $val) {
                 array_set($a, str_replace(':', '', $key), $val);
+            }
                 if (preg_match('/[\.\:]/', $key)) {
                     unset($a[$key]);
                 }
@@ -184,10 +185,13 @@ 
                     list($r, $k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col1 = explode(':', $c)[0];
-                    if (!array_key_exists($col1, $availInput[$k])) return [null => null];
+                    if (!array_key_exists($col1, $availInput[$k])) {
+                        return [null => null];
+                    }
                     $rows = $availInput[$k][$col1];
-                    if (!is_array($rows))
-                        return $array_key_attach_str($field->validationMessages, $v);
+                    if (!is_array($rows)) {
+                                            return $array_key_attach_str($field->validationMessages, $v);
+                    }
                     $r = [];
                     foreach (array_keys($rows) as $k) {
                         $k = "{$v}{$k}";
@@ -209,7 +213,9 @@ 
             $idx = "{$rel}.{$key}.{$col}";
             //Fix ResetInput Function! A Headache Implementation!
             $col1 = explode(':', $col)[0];
-            if (!array_key_exists($col1, $availInput[$key])) return [null => null];
+            if (!array_key_exists($col1, $availInput[$key])) {
+                return [null => null];
+            }
             if (is_array($availInput[$key][$col1])) {
                 return call_user_func_array('array_merge', array_map(function ($x, $y) use ($idx) {
                     return ["{$idx}{$x}" => $y];
@@ -224,7 +230,9 @@ 
             $idx = "{$rel}.{$key}.{$col}";
             //Fix ResetInput Function! A Headache Implementation!
             $col1 = explode(':', $col)[0];
-            if (!array_key_exists($col1, $availInput[$key])) return [null => null];
+            if (!array_key_exists($col1, $availInput[$key])) {
+                return [null => null];
+            }
             if (is_array($availInput[$key][$col1])) {
                 return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $rules) {
                     return ["{$idx}{$x}" => $rules[$idx]];
@@ -241,11 +249,14 @@ 
             $idx = "{$rel}.{$key}.{$col}";
             //Fix ResetInput Function! A Headache Implementation!
             $col1 = explode(':', $col)[0];
-            if (!array_key_exists($col1, $availInput[$key])) return [null => null];
+            if (!array_key_exists($col1, $availInput[$key])) {
+                return [null => null];
+            }
             if (is_array($availInput[$key][$col1])) {
-                if (array_keys($availInput[$key][$col1]))
-                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
+                if (array_keys($availInput[$key][$col1])) {
+                                    return call_user_func_array('array_merge', array_map(function ($x) use ($idx, $attributes) {
                     return ["{$idx}.{$x}" => $attributes[$idx]];
+                }
                 }, array_keys($availInput[$key][$col1])));
                 return [null => null];
             }