z-song / laravel-admin

src/Grid/Displayers/Editable.php

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
             'data-value' => "{$this->value}",
         ];
 
-        $attributes = collect($attributes)->map(function ($attribute, $name) {
+        $attributes = collect($attributes)->map(function($attribute, $name) {
             return "$name='$attribute'";
         })->implode(' ');
 

src/Grid/Filter.php

Spacing +9 added lines, -9 removed lines

@@ -240,7 +240,7 @@ 
      */
     protected function removeFilterByID($id)
     {
-        $this->filters = array_filter($this->filters, function (AbstractFilter $filter) use ($id) {
+        $this->filters = array_filter($this->filters, function(AbstractFilter $filter) use ($id) {
             return $filter->getId() != $id;
         });
     }
@@ -254,7 +254,7 @@ 
     {
         $inputs = array_dot(Input::all());
 
-        $inputs = array_filter($inputs, function ($input) {
+        $inputs = array_filter($inputs, function($input) {
             return $input !== '' && !is_null($input);
         });
 
@@ -278,7 +278,7 @@ 
             $conditions[] = $filter->condition($params);
         }
 
-        return tap(array_filter($conditions), function ($conditions) {
+        return tap(array_filter($conditions), function($conditions) {
             if (!empty($conditions)) {
                 $this->expand();
             }
@@ -296,9 +296,9 @@ 
             return $inputs;
         }
 
-        $inputs = collect($inputs)->filter(function ($input, $key) {
+        $inputs = collect($inputs)->filter(function($input, $key) {
             return starts_with($key, "{$this->name}_");
-        })->mapWithKeys(function ($val, $key) {
+        })->mapWithKeys(function($val, $key) {
             $key = str_replace("{$this->name}_", '', $key);
 
             return [$key => $val];
@@ -351,7 +351,7 @@ 
      */
     public function scope($key, $label = '')
     {
-        return tap(new Scope($key, $label), function (Scope $scope) {
+        return tap(new Scope($key, $label), function(Scope $scope) {
             return $this->scopes->push($scope);
         });
     }
@@ -375,7 +375,7 @@ 
     {
         $key = request(Scope::QUERY_NAME);
 
-        return $this->scopes->first(function ($scope) use ($key) {
+        return $this->scopes->first(function($scope) use ($key) {
             return $scope->key == $key;
         });
     }
@@ -495,9 +495,9 @@ 
 
         $columns->push($pageKey);
 
-        $groupNames = collect($this->filters)->filter(function ($filter) {
+        $groupNames = collect($this->filters)->filter(function($filter) {
             return $filter instanceof Group;
-        })->map(function (AbstractFilter $filter) {
+        })->map(function(AbstractFilter $filter) {
             return "{$filter->getId()}_group";
         });
 

src/Form/Field/Embeds.php

Spacing +42 added lines, -42 removed lines

@@ -60,16 +60,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 array_merge($a, call_user_func_array('array_merge', $b));
         };
 
@@ -83,7 +83,7 @@ 
             $columns = is_array($column) ? $column : [$column];
             if ($field instanceof Field\MultipleSelect || $field instanceof Field\Listbox) {
                 $availInput[$column] = array_filter($availInput[$column], 'strlen');
-                $availInput[$column] = $availInput[$column] ? : null;
+                $availInput[$column] = $availInput[$column] ?: null;
             }
             /*
              *
@@ -105,13 +105,13 @@ 
              *     '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));
 
             $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];
@@ -142,16 +142,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 array_merge($a, call_user_func_array('array_merge', $b));
         };
 
@@ -165,7 +165,7 @@ 
             $columns = is_array($column) ? $column : [$column];
             if ($field instanceof Field\MultipleSelect || $field instanceof Field\Listbox) {
                 $availInput[$column] = array_filter($availInput[$column], 'strlen');
-                $availInput[$column] = $availInput[$column] ? : null;
+                $availInput[$column] = $availInput[$column] ?: null;
             }
             /*
              *
@@ -187,20 +187,20 @@ 
              *     '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));
 
-            $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])));
@@ -209,7 +209,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);
@@ -233,16 +233,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 array_merge($a, call_user_func_array('array_merge', $b));
         };
 
@@ -256,7 +256,7 @@ 
             $columns = is_array($column) ? $column : [$column];
             if ($field instanceof Field\MultipleSelect || $field instanceof Field\Listbox) {
                 $availInput[$column] = array_filter($availInput[$column], 'strlen');
-                $availInput[$column] = $availInput[$column] ? : null;
+                $availInput[$column] = $availInput[$column] ?: null;
             }
             /*
              *
@@ -278,12 +278,12 @@ 
              *     '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));
 
-            $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];
@@ -318,16 +318,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 array_merge($a, call_user_func_array('array_merge', $b));
         };
 
@@ -341,7 +341,7 @@ 
             $columns = is_array($column) ? $column : [$column];
             if ($field instanceof Field\MultipleSelect || $field instanceof Field\Listbox) {
                 $availInput[$column] = array_filter($availInput[$column], 'strlen');
-                $availInput[$column] = $availInput[$column] ? : null;
+                $availInput[$column] = $availInput[$column] ?: null;
             }
             /*
              *
@@ -363,18 +363,18 @@ 
              *     '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));
 
             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])));
                     }
@@ -403,7 +403,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) {
@@ -415,8 +415,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;
 
@@ -462,7 +462,7 @@ 
             return json_decode($this->value, true);
         }
 
-        return (array)$this->value;
+        return (array) $this->value;
     }
 
     /**
@@ -472,28 +472,28 @@ 
      */
     protected function buildEmbeddedForm()
     {
-        $form = new EmbeddedForm($this->elementName?:$this->column);
+        $form = new EmbeddedForm($this->elementName ?: $this->column);
 
         $form->setParent($this->form);
 
         call_user_func($this->builder, $form);
 
-        if($this->elementName)
+        if ($this->elementName)
         {
-            list($rel,$key,$col)=explode('.',$this->errorKey);
-            $form->fields()->each(function (Field $field) use ($rel,$key,$col){
+            list($rel, $key, $col) = explode('.', $this->errorKey);
+            $form->fields()->each(function(Field $field) use ($rel, $key, $col){
                 $column = $field->column();
                 $elementName = $elementClass = $errorKey = [];
                 if (is_array($column)) {
                     foreach ($column as $k => $name) {
-                        $errorKey[$k] = sprintf('%s.%s.%s.%s',$rel,$key,$col,$name);
-                        $elementName[$k] = sprintf('%s[%s][%s][%s]',$rel,$key,$col,$name);
-                        $elementClass[$k] = [$rel,$col, $name];
+                        $errorKey[$k] = sprintf('%s.%s.%s.%s', $rel, $key, $col, $name);
+                        $elementName[$k] = sprintf('%s[%s][%s][%s]', $rel, $key, $col, $name);
+                        $elementClass[$k] = [$rel, $col, $name];
                     }
                 } else {
-                    $errorKey = sprintf('%s.%s.%s.%s', $rel, $key, $col,$column);
-                    $elementName = sprintf('%s[%s][%s][%s]', $rel, $key, $col,$column);
-                    $elementClass = [$rel,$col, $column];
+                    $errorKey = sprintf('%s.%s.%s.%s', $rel, $key, $col, $column);
+                    $elementName = sprintf('%s[%s][%s][%s]', $rel, $key, $col, $column);
+                    $elementClass = [$rel, $col, $column];
                 }
                 $field->setErrorKey($errorKey)
                     ->setElementName($elementName)

src/Form/Field/HasMany.php

Indentation +1 added lines, -1 removed lines

@@ -224,7 +224,7 @@
                     return $embed ? $array_key_attach_str($embed, $v) : null;
                 }, $newColumn);
                 $messages = $array_clean_merge($messages, array_filter($newMessages));
-               // dd($rules, $attributes, $messages, $newInputs);
+                // dd($rules, $attributes, $messages, $newInputs);
             } else {
                 $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
                 $newRules = array_map(function ($v) use ($fieldRules, $availInput, $array_key_attach_str) {

Spacing +23 added lines, -23 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 array_merge($a, call_user_func_array('array_merge', $b));
         };
 
-        $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) {
@@ -138,7 +138,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);
@@ -154,12 +154,12 @@ 
             $columns = is_array($column) ? $column : [$column];
             if ($field instanceof Field\MultipleSelect || $field instanceof Field\Listbox) {
                 foreach ($keys as $key) {
-                    $availInput[$key][$column] = array_filter($availInput[$key][$column], 'strlen') ? : null;
+                    $availInput[$key][$column] = array_filter($availInput[$key][$column], 'strlen') ?: null;
                 }
             }
 
-            $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));
@@ -167,7 +167,7 @@ 
 
             if ($field instanceof Field\Embeds) {
                 // dd($field->column(), $input, $old, $availInput);
-                $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]]);
@@ -181,7 +181,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]]);
@@ -195,7 +195,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]]);
@@ -209,7 +209,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]]);
@@ -227,7 +227,7 @@ 
                // dd($rules, $attributes, $messages, $newInputs);
             } 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];
@@ -240,7 +240,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];
@@ -257,15 +257,15 @@ 
                 }, $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] . ']' : '';
+                            $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
 
                             return ["{$v}:{$u}" => $w];
                         }, array_keys($availInput[$k][$col])));
@@ -274,7 +274,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);
@@ -283,12 +283,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])));
                     }
@@ -459,7 +459,7 @@ 
      */
     protected function setupScript($script)
     {
-        $method = 'setupScriptFor' . ucfirst($this->viewMode) . 'View';
+        $method = 'setupScriptFor'.ucfirst($this->viewMode).'View';
 
         call_user_func([$this, $method], $script);
     }