z-song / laravel-admin

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/Traits/HasAssets.php

Spacing +4 added lines, -4 removed lines

@@ -118,9 +118,9 @@ 
 
         if (!is_null($css)) {
             if ($appendCss) {
-                return self::$appendCss = array_merge(self::$appendCss, (array)$css);
+                return self::$appendCss = array_merge(self::$appendCss, (array) $css);
             } else {
-                return self::$css = array_merge(self::$css, (array)$css);
+                return self::$css = array_merge(self::$css, (array) $css);
             }
         }
 
@@ -242,7 +242,7 @@ 
         $script = collect(static::$script)
             ->merge(static::$deferredScript)
             ->unique()
-            ->map(function ($line) {
+            ->map(function($line) {
                 return $line;
                 //@see https://stackoverflow.com/questions/19509863/how-to-remove-js-comments-using-php
                 $pattern = '/(?:(?:\/\*(?:[^*]|(?:\*+[^*\/]))*\*+\/)|(?:(?<!\:|\\\|\')\/\/.*))/';
@@ -267,7 +267,7 @@ 
 
         $style = collect(static::$style)
             ->unique()
-            ->map(function ($line) {
+            ->map(function($line) {
                 return preg_replace('/\s+/', ' ', $line);
             });