z-song / laravel-admin

src/Controllers/UserController.php

Spacing +7 added lines, -7 removed lines

@@ -35,14 +35,14 @@ 
         $grid->column('created_at', trans('admin.created_at'));
         $grid->column('updated_at', trans('admin.updated_at'));
 
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
             if ($actions->getKey() == 1) {
                 $actions->disableDelete();
             }
         });
 
-        $grid->tools(function (Grid\Tools $tools) {
-            $tools->batch(function (Grid\Tools\BatchActions $actions) {
+        $grid->tools(function(Grid\Tools $tools) {
+            $tools->batch(function(Grid\Tools\BatchActions $actions) {
                 $actions->disableDelete();
             });
         });
@@ -66,10 +66,10 @@ 
         $show->field('id', 'ID');
         $show->field('username', trans('admin.username'));
         $show->field('name', trans('admin.name'));
-        $show->field('roles', trans('admin.roles'))->as(function ($roles) {
+        $show->field('roles', trans('admin.roles'))->as(function($roles) {
             return $roles->pluck('name');
         })->label();
-        $show->field('permissions', trans('admin.permissions'))->as(function ($permission) {
+        $show->field('permissions', trans('admin.permissions'))->as(function($permission) {
             return $permission->pluck('name');
         })->label();
         $show->field('created_at', trans('admin.created_at'));
@@ -103,7 +103,7 @@ 
         $form->image('avatar', trans('admin.avatar'));
         $form->password('password', trans('admin.password'))->rules('required|confirmed');
         $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
-            ->default(function ($form) {
+            ->default(function($form) {
                 return $form->model()->password;
             });
 
@@ -115,7 +115,7 @@ 
         $form->display('created_at', trans('admin.created_at'));
         $form->display('updated_at', trans('admin.updated_at'));
 
-        $form->saving(function (Form $form) {
+        $form->saving(function(Form $form) {
             if ($form->password && $form->model()->password != $form->password) {
                 $form->password = Hash::make($form->password);
             }

src/Controllers/AuthController.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
     {
         $form = $this->settingForm();
         $form->tools(
-            function (Form\Tools $tools) {
+            function(Form\Tools $tools) {
                 $tools->disableList();
                 $tools->disableDelete();
                 $tools->disableView();
@@ -134,7 +134,7 @@ 
         $form->image('avatar', trans('admin.avatar'));
         $form->password('password', trans('admin.password'))->rules('confirmed|required');
         $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
-            ->default(function ($form) {
+            ->default(function($form) {
                 return $form->model()->password;
             });
 
@@ -142,13 +142,13 @@ 
 
         $form->ignore(['password_confirmation']);
 
-        $form->saving(function (Form $form) {
+        $form->saving(function(Form $form) {
             if ($form->password && $form->model()->password != $form->password) {
                 $form->password = Hash::make($form->password);
             }
         });
 
-        $form->saved(function () {
+        $form->saved(function() {
             admin_toastr(trans('admin.update_succeeded'));
 
             return redirect(admin_url('auth/setting'));

src/Form.php

Spacing +10 added lines, -10 removed lines

@@ -253,7 +253,7 @@ 
                 return $ret;
             }
 
-            collect(explode(',', $id))->filter()->each(function ($id) {
+            collect(explode(',', $id))->filter()->each(function($id) {
                 $builder = $this->model()->newQuery();
 
                 if ($this->isSoftDeletes) {
@@ -306,9 +306,9 @@ 
 
         $data = $model->toArray();
 
-        $this->fields()->filter(function ($field) {
+        $this->fields()->filter(function($field) {
             return $field instanceof Field\File;
-        })->each(function (Field\File $file) use ($data) {
+        })->each(function(Field\File $file) use ($data) {
             $file->setOriginal($data);
 
             $file->destroy();
@@ -333,7 +333,7 @@ 
             return $response;
         }
 
-        DB::transaction(function () {
+        DB::transaction(function() {
             $inserts = $this->prepareInsert($this->updates);
 
             foreach ($inserts as $column => $value) {
@@ -537,7 +537,7 @@ 
             return $response;
         }
 
-        DB::transaction(function () {
+        DB::transaction(function() {
             $updates = $this->prepareUpdate($this->updates);
 
             foreach ($updates as $column => $value) {
@@ -987,7 +987,7 @@ 
     protected function getFieldByColumn($column)
     {
         return $this->fields()->first(
-            function (Field $field) use ($column) {
+            function(Field $field) use ($column) {
                 if (is_array($field->column())) {
                     return in_array($column, $field->column());
                 }
@@ -1006,7 +1006,7 @@ 
     {
         $values = $this->model->toArray();
 
-        $this->fields()->each(function (Field $field) use ($values) {
+        $this->fields()->each(function(Field $field) use ($values) {
             $field->setOriginal($values);
         });
     }
@@ -1020,7 +1020,7 @@ 
     {
         $relations = $this->getRelations();
 
-        $this->fields()->each(function (Field $field) use ($relations) {
+        $this->fields()->each(function(Field $field) use ($relations) {
             if ($field->getSnakeAttributes()) {
                 return;
             }
@@ -1062,7 +1062,7 @@ 
 
         $data = $this->model->toArray();
 
-        $this->fields()->each(function (Field $field) use ($data) {
+        $this->fields()->each(function(Field $field) use ($data) {
             if (!in_array($field->column(), $this->ignored, true)) {
                 $field->fill($data);
             }
@@ -1193,7 +1193,7 @@ 
      */
     public function setWidth($fieldWidth = 8, $labelWidth = 2): self
     {
-        $this->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
+        $this->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
             /* @var Field $field  */
             $field->setWidth($fieldWidth, $labelWidth);
         });

src/Grid/Concerns/CanHidesColumns.php

Spacing +3 added lines, -4 removed lines

@@ -74,8 +74,7 @@ 
 
         $columns = $requestColumn ? explode(',', $requestColumn) : [];
 
-        return array_filter($columns) ?:
-            array_values(array_diff($this->columnNames, $this->hiddenColumns));
+        return array_filter($columns) ?: array_values(array_diff($this->columnNames, $this->hiddenColumns));
     }
 
     /**
@@ -93,7 +92,7 @@ 
 
         array_push($visible, Grid\Column::SELECT_COLUMN_NAME, Grid\Column::ACTION_COLUMN_NAME);
 
-        return $this->columns->filter(function (Grid\Column $column) use ($visible) {
+        return $this->columns->filter(function(Grid\Column $column) use ($visible) {
             return in_array($column->getName(), $visible);
         });
     }
@@ -113,7 +112,7 @@ 
 
         array_push($visible, Grid\Column::SELECT_COLUMN_NAME, Grid\Column::ACTION_COLUMN_NAME);
 
-        return collect($this->columnNames)->filter(function ($column) use ($visible) {
+        return collect($this->columnNames)->filter(function($column) use ($visible) {
             return in_array($column, $visible);
         })->toArray();
     }

src/Grid/Column.php

Spacing +7 added lines, -7 removed lines

@@ -430,7 +430,7 @@ 
 
         $column = $this;
 
-        return $this->display(function ($value) use ($grid, $column, $abstract, $arguments) {
+        return $this->display(function($value) use ($grid, $column, $abstract, $arguments) {
             /** @var AbstractDisplayer $displayer */
             $displayer = new $abstract($value, $grid, $column, $this);
 
@@ -479,7 +479,7 @@ 
 
         $grid = $this->grid;
 
-        return $this->display(function ($_, $column) use ($action, $grid) {
+        return $this->display(function($_, $column) use ($action, $grid) {
             /** @var RowAction $action */
             $action = new $action();
 
@@ -607,7 +607,7 @@ 
         $grid = $this->grid;
         $column = $this;
 
-        $this->display(function ($value) use ($grid, $column, $class) {
+        $this->display(function($value) use ($grid, $column, $class) {
             /** @var AbstractDisplayer $definition */
             $definition = new $class($value, $grid, $column, $this);
 
@@ -625,7 +625,7 @@ 
     protected function htmlEntityEncode($item)
     {
         if (is_array($item)) {
-            array_walk_recursive($item, function (&$value) {
+            array_walk_recursive($item, function(&$value) {
                 $value = htmlentities($value ?? '');
             });
         } else {
@@ -662,7 +662,7 @@ 
      */
     protected function callSupportDisplayer($abstract, $arguments)
     {
-        return $this->display(function ($value) use ($abstract, $arguments) {
+        return $this->display(function($value) use ($abstract, $arguments) {
             if (is_array($value) || $value instanceof Arrayable) {
                 return call_user_func_array([collect($value), $abstract], $arguments);
             }
@@ -686,7 +686,7 @@ 
     protected function callBuiltinDisplayer($abstract, $arguments)
     {
         if ($abstract instanceof Closure) {
-            return $this->display(function ($value) use ($abstract, $arguments) {
+            return $this->display(function($value) use ($abstract, $arguments) {
                 return $abstract->call($this, ...array_merge([$value], $arguments));
             });
         }
@@ -695,7 +695,7 @@ 
             $grid = $this->grid;
             $column = $this;
 
-            return $this->display(function ($value) use ($abstract, $grid, $column, $arguments) {
+            return $this->display(function($value) use ($abstract, $grid, $column, $arguments) {
                 /** @var AbstractDisplayer $displayer */
                 $displayer = new $abstract($value, $grid, $column, $this);
 

src/Grid/Displayers/Label.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
             $this->value = $this->value->toArray();
         }
 
-        return collect((array) $this->value)->map(function ($item) use ($style) {
+        return collect((array) $this->value)->map(function($item) use ($style) {
             if (is_array($style)) {
                 $columnValue = $this->getColumn()->getOriginal();
 

src/Grid/Exporters/CsvExporter.php

Spacing +4 added lines, -4 removed lines

@@ -157,16 +157,16 @@ 
             call_user_func($this->callback, $this);
         }
 
-        $response = function () {
+        $response = function() {
             $handle = fopen('php://output', 'w');
             $titles = [];
             fwrite($handle, chr(0xEF).chr(0xBB).chr(0xBF)); //导出的CSV文件是无BOM编码UTF-8，而我们通常使用UTF-8编码格式都是有BOM的。所以添加BOM于CSV中
-            $this->chunk(function ($collection) use ($handle, &$titles) {
+            $this->chunk(function($collection) use ($handle, &$titles) {
                 Column::setOriginalGridModels($collection);
 
                 $original = $current = $collection->toArray();
 
-                $this->grid->getColumns()->map(function (Column $column) use (&$current) {
+                $this->grid->getColumns()->map(function(Column $column) use (&$current) {
                     $current = $column->fill($current);
                     $this->grid->columnNames[] = $column->getName();
                 });
@@ -195,7 +195,7 @@ 
     protected function getVisiableTitles()
     {
         $titles = $this->grid->visibleColumns()
-            ->mapWithKeys(function (Column $column) {
+            ->mapWithKeys(function(Column $column) {
                 $columnName = $column->getName();
                 $columnTitle = $column->getLabel();
                 if (isset($this->titleCallbacks[$columnName])) {

src/Grid/Model.php

Spacing +10 added lines, -10 removed lines

@@ -325,9 +325,9 @@ 
 
         $this->setSort();
 
-        $this->queries->reject(function ($query) {
+        $this->queries->reject(function($query) {
             return $query['method'] == 'paginate';
-        })->each(function ($query) {
+        })->each(function($query) {
             $this->model = $this->model->{$query['method']}(...$query['arguments']);
         });
 
@@ -378,7 +378,7 @@ 
         $this->setSort();
         $this->setPaginate();
 
-        $this->queries->unique()->each(function ($query) {
+        $this->queries->unique()->each(function($query) {
             $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']);
         });
 
@@ -408,9 +408,9 @@ 
 
         $queryBuilder = $this->originalModel;
 
-        $this->queries->reject(function ($query) {
+        $this->queries->reject(function($query) {
             return in_array($query['method'], ['get', 'paginate']);
-        })->each(function ($query) use (&$queryBuilder) {
+        })->each(function($query) use (&$queryBuilder) {
             $queryBuilder = $queryBuilder->{$query['method']}(...$query['arguments']);
         });
 
@@ -444,7 +444,7 @@ 
     {
         $paginate = $this->findQueryByMethod('paginate');
 
-        $this->queries = $this->queries->reject(function ($query) {
+        $this->queries = $this->queries->reject(function($query) {
             return $query['method'] == 'paginate';
         });
 
@@ -502,7 +502,7 @@ 
      */
     protected function findQueryByMethod($method)
     {
-        return $this->queries->first(function ($query) use ($method) {
+        return $this->queries->first(function($query) use ($method) {
             return $query['method'] == $method;
         });
     }
@@ -525,7 +525,7 @@ 
         }
 
         $columnNameContainsDots = Str::contains($columnName, '.');
-        $isRelation = $this->queries->contains(function ($query) use ($columnName) {
+        $isRelation = $this->queries->contains(function($query) use ($columnName) {
             // relationship should be camel case
             $columnName = Str::camel(Str::before($columnName, '.'));
 
@@ -576,7 +576,7 @@ 
         // relationship should be camel case
         $relationName = Str::camel($relationName);
 
-        if ($this->queries->contains(function ($query) use ($relationName) {
+        if ($this->queries->contains(function($query) use ($relationName) {
             return $query['method'] == 'with' && in_array($relationName, $query['arguments']);
         })) {
             $relation = $this->model->$relationName();
@@ -610,7 +610,7 @@ 
      */
     public function resetOrderBy()
     {
-        $this->queries = $this->queries->reject(function ($query) {
+        $this->queries = $this->queries->reject(function($query) {
             return $query['method'] == 'orderBy' || $query['method'] == 'orderByDesc';
         });
     }

src/Console/GenerateMenuCommand.php

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
     public function handle()
     {
         $prefix = config('admin.route.prefix');
-        $routes = collect($this->router->getRoutes())->filter(function (Route $route) use ($prefix) {
+        $routes = collect($this->router->getRoutes())->filter(function(Route $route) use ($prefix) {
             $uri = $route->uri();
             // built-in, parameterized and no-GET are ignored
             return Str::startsWith($uri, "{$prefix}/")
@@ -59,7 +59,7 @@ 
                 && in_array('GET', $route->methods())
                 && !in_array(substr($route->uri(), strlen("{$prefix}/")), config('admin.menu_exclude'));
         })
-            ->map(function (Route $route) use ($prefix) {
+            ->map(function(Route $route) use ($prefix) {
                 $uri = substr($route->uri(), strlen("{$prefix}/"));
 
                 return [
@@ -73,7 +73,7 @@ 
 
         $menus = Menu::all()->pluck('title', 'uri');
         // exclude exist ones
-        $news = $routes->diffKeys($menus)->map(function ($item, $key) {
+        $news = $routes->diffKeys($menus)->map(function($item, $key) {
             return [
                 'title' => $item,
                 'uri'   => $key,
@@ -87,7 +87,7 @@ 
         } else {
             if ($this->hasOption('dry-run') && $this->option('dry-run')) {
                 $this->line('<info>The following menu items will be created</info>: ');
-                $this->table(['Title', 'Uri'], array_map(function ($item) {
+                $this->table(['Title', 'Uri'], array_map(function($item) {
                     return [
                         $item['title'],
                         $item['uri'],