Completed
Pull Request — master (#5883)
by
unknown
28s
created
src/Grid/Concerns/CanHidesColumns.php 1 patch
Spacing   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -74,8 +74,7 @@  discard block
 block discarded – undo
74 74
 
75 75
         $columns = $requestColumn ? explode(',', $requestColumn) : [];
76 76
 
77
-        return array_filter($columns) ?:
78
-            array_values(array_diff($this->columnNames, $this->hiddenColumns));
77
+        return array_filter($columns) ?: array_values(array_diff($this->columnNames, $this->hiddenColumns));
79 78
     }
80 79
 
81 80
     /**
@@ -93,7 +92,7 @@  discard block
 block discarded – undo
93 92
 
94 93
         array_push($visible, Grid\Column::SELECT_COLUMN_NAME, Grid\Column::ACTION_COLUMN_NAME);
95 94
 
96
-        return $this->columns->filter(function (Grid\Column $column) use ($visible) {
95
+        return $this->columns->filter(function(Grid\Column $column) use ($visible) {
97 96
             return in_array($column->getName(), $visible);
98 97
         });
99 98
     }
@@ -113,7 +112,7 @@  discard block
 block discarded – undo
113 112
 
114 113
         array_push($visible, Grid\Column::SELECT_COLUMN_NAME, Grid\Column::ACTION_COLUMN_NAME);
115 114
 
116
-        return collect($this->columnNames)->filter(function ($column) use ($visible) {
115
+        return collect($this->columnNames)->filter(function($column) use ($visible) {
117 116
             return in_array($column, $visible);
118 117
         })->toArray();
119 118
     }
Please login to merge, or discard this patch.
src/Grid/Displayers/Label.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
             $this->value = $this->value->toArray();
14 14
         }
15 15
 
16
-        return collect((array) $this->value)->map(function ($item) use ($style) {
16
+        return collect((array) $this->value)->map(function($item) use ($style) {
17 17
             if (is_array($style)) {
18 18
                 $columnValue = $this->getColumn()->getOriginal();
19 19
 
Please login to merge, or discard this patch.
src/Grid/Model.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -325,9 +325,9 @@  discard block
 block discarded – undo
325 325
 
326 326
         $this->setSort();
327 327
 
328
-        $this->queries->reject(function ($query) {
328
+        $this->queries->reject(function($query) {
329 329
             return $query['method'] == 'paginate';
330
-        })->each(function ($query) {
330
+        })->each(function($query) {
331 331
             $this->model = $this->model->{$query['method']}(...$query['arguments']);
332 332
         });
333 333
 
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
         $this->setSort();
379 379
         $this->setPaginate();
380 380
 
381
-        $this->queries->unique()->each(function ($query) {
381
+        $this->queries->unique()->each(function($query) {
382 382
             $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']);
383 383
         });
384 384
 
@@ -408,9 +408,9 @@  discard block
 block discarded – undo
408 408
 
409 409
         $queryBuilder = $this->originalModel;
410 410
 
411
-        $this->queries->reject(function ($query) {
411
+        $this->queries->reject(function($query) {
412 412
             return in_array($query['method'], ['get', 'paginate']);
413
-        })->each(function ($query) use (&$queryBuilder) {
413
+        })->each(function($query) use (&$queryBuilder) {
414 414
             $queryBuilder = $queryBuilder->{$query['method']}(...$query['arguments']);
415 415
         });
416 416
 
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
     {
445 445
         $paginate = $this->findQueryByMethod('paginate');
446 446
 
447
-        $this->queries = $this->queries->reject(function ($query) {
447
+        $this->queries = $this->queries->reject(function($query) {
448 448
             return $query['method'] == 'paginate';
449 449
         });
450 450
 
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
      */
503 503
     protected function findQueryByMethod($method)
504 504
     {
505
-        return $this->queries->first(function ($query) use ($method) {
505
+        return $this->queries->first(function($query) use ($method) {
506 506
             return $query['method'] == $method;
507 507
         });
508 508
     }
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
         }
526 526
 
527 527
         $columnNameContainsDots = Str::contains($columnName, '.');
528
-        $isRelation = $this->queries->contains(function ($query) use ($columnName) {
528
+        $isRelation = $this->queries->contains(function($query) use ($columnName) {
529 529
             // relationship should be camel case
530 530
             $columnName = Str::camel(Str::before($columnName, '.'));
531 531
 
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
         // relationship should be camel case
577 577
         $relationName = Str::camel($relationName);
578 578
 
579
-        if ($this->queries->contains(function ($query) use ($relationName) {
579
+        if ($this->queries->contains(function($query) use ($relationName) {
580 580
             return $query['method'] == 'with' && in_array($relationName, $query['arguments']);
581 581
         })) {
582 582
             $relation = $this->model->$relationName();
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
      */
611 611
     public function resetOrderBy()
612 612
     {
613
-        $this->queries = $this->queries->reject(function ($query) {
613
+        $this->queries = $this->queries->reject(function($query) {
614 614
             return $query['method'] == 'orderBy' || $query['method'] == 'orderByDesc';
615 615
         });
616 616
     }
Please login to merge, or discard this patch.
src/Console/GenerateMenuCommand.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
     public function handle()
50 50
     {
51 51
         $prefix = config('admin.route.prefix');
52
-        $routes = collect($this->router->getRoutes())->filter(function (Route $route) use ($prefix) {
52
+        $routes = collect($this->router->getRoutes())->filter(function(Route $route) use ($prefix) {
53 53
             $uri = $route->uri();
54 54
             // built-in, parameterized and no-GET are ignored
55 55
             return Str::startsWith($uri, "{$prefix}/")
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
                 && in_array('GET', $route->methods())
60 60
                 && !in_array(substr($route->uri(), strlen("{$prefix}/")), config('admin.menu_exclude'));
61 61
         })
62
-            ->map(function (Route $route) use ($prefix) {
62
+            ->map(function(Route $route) use ($prefix) {
63 63
                 $uri = substr($route->uri(), strlen("{$prefix}/"));
64 64
 
65 65
                 return [
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
         $menus = Menu::all()->pluck('title', 'uri');
75 75
         // exclude exist ones
76
-        $news = $routes->diffKeys($menus)->map(function ($item, $key) {
76
+        $news = $routes->diffKeys($menus)->map(function($item, $key) {
77 77
             return [
78 78
                 'title' => $item,
79 79
                 'uri'   => $key,
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
         } else {
88 88
             if ($this->hasOption('dry-run') && $this->option('dry-run')) {
89 89
                 $this->line('<info>The following menu items will be created</info>: ');
90
-                $this->table(['Title', 'Uri'], array_map(function ($item) {
90
+                $this->table(['Title', 'Uri'], array_map(function($item) {
91 91
                     return [
92 92
                         $item['title'],
93 93
                         $item['uri'],
Please login to merge, or discard this patch.
src/Actions/RowSimpleAction.php 1 patch
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -61,8 +61,9 @@  discard block
 block discarded – undo
61 61
     private function renderDefault(): void
62 62
     {
63 63
         $render_key = get_called_class().'-default';
64
-        if (array_key_exists($render_key, static::$is_rendered))
65
-            return;
64
+        if (array_key_exists($render_key, static::$is_rendered)) {
65
+                    return;
66
+        }
66 67
         static::$is_rendered[$render_key] = true;
67 68
 
68 69
         $parameters = json_encode($this->parameters());
@@ -106,8 +107,9 @@  discard block
 block discarded – undo
106 107
         }
107 108
 
108 109
         $render_key = get_called_class().'-dialog';
109
-        if (array_key_exists($render_key, static::$is_rendered))
110
-            return;
110
+        if (array_key_exists($render_key, static::$is_rendered)) {
111
+                    return;
112
+        }
111 113
         static::$is_rendered[$render_key] = true;
112 114
 
113 115
         $parameters = json_encode($this->parameters());
@@ -178,8 +180,9 @@  discard block
 block discarded – undo
178 180
                 'label' => $row['label'],
179 181
             ];
180 182
 
181
-            if (!empty($row['rules']) && in_array('required', $row['rules']))
182
-                $tmp['is_required'] = 1;
183
+            if (!empty($row['rules']) && in_array('required', $row['rules'])) {
184
+                            $tmp['is_required'] = 1;
185
+            }
183 186
 
184 187
             if (array_key_exists('options', $row)) {
185 188
                 if (empty(static::$select_options)) {
@@ -201,8 +204,9 @@  discard block
 block discarded – undo
201 204
             $props[] = $tmp;
202 205
         }
203 206
 
204
-        if (!empty($props))
205
-            $this->attribute('data-props', json_encode($props, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
207
+        if (!empty($props)) {
208
+                    $this->attribute('data-props', json_encode($props, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
209
+        }
206 210
 
207 211
         $confirm = (new \ReflectionClass($this->interactor))->getProperty('confirm')->getValue($this->interactor);
208 212
         if (!empty($confirm)) {
@@ -210,8 +214,9 @@  discard block
 block discarded – undo
210 214
         }
211 215
 
212 216
         $render_key = get_called_class().'-form';
213
-        if (array_key_exists($render_key, static::$is_rendered))
214
-            return;
217
+        if (array_key_exists($render_key, static::$is_rendered)) {
218
+                    return;
219
+        }
215 220
         static::$is_rendered[$render_key] = true;
216 221
 
217 222
         $this->interactor->addModalHtml();
Please login to merge, or discard this patch.
src/Grid/Displayers/Copyable.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,8 +31,9 @@
 block discarded – undo
31 31
     public function display(): string
32 32
     {
33 33
         $content = $this->getColumn()->getOriginal();
34
-        if (is_null($content) || $content === '')
35
-            return '';
34
+        if (is_null($content) || $content === '') {
35
+                    return '';
36
+        }
36 37
 
37 38
         $this->addScript();
38 39
 
Please login to merge, or discard this patch.
src/Grid/Exporters/CsvExporter.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -168,16 +168,16 @@  discard block
 block discarded – undo
168 168
             call_user_func($this->callback, $this);
169 169
         }
170 170
 
171
-        $response = function () {
171
+        $response = function() {
172 172
             $handle = fopen('php://output', 'w');
173 173
             $titles = [];
174 174
             fwrite($handle, chr(0xEF).chr(0xBB).chr(0xBF));
175
-            $this->chunk(function ($collection) use ($handle, &$titles) {
175
+            $this->chunk(function($collection) use ($handle, &$titles) {
176 176
                 Column::setOriginalGridModels($collection);
177 177
 
178 178
                 $original = $current = $collection->toArray();
179 179
 
180
-                $this->grid->getColumns()->map(function (Column $column) use (&$current) {
180
+                $this->grid->getColumns()->map(function(Column $column) use (&$current) {
181 181
                     $current = $column->fill($current);
182 182
                     $this->grid->columnNames[] = $column->getName();
183 183
                 });
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
     protected function getVisiableTitles()
207 207
     {
208 208
         $titles = $this->grid->visibleColumns()
209
-            ->mapWithKeys(function (Column $column) {
209
+            ->mapWithKeys(function(Column $column) {
210 210
                 $columnName = $column->getName();
211 211
                 $columnTitle = $column->getLabel();
212 212
                 if (isset($this->titleCallbacks[$columnName])) {
Please login to merge, or discard this patch.
src/Console/ResourceGenerator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -240,7 +240,7 @@
 block discarded – undo
240 240
     {
241 241
         $connection = $this->model->getConnection();
242 242
 
243
-        return $connection->getSchemaBuilder()->getColumns($connection->getTablePrefix() . $this->model->getTable());
243
+        return $connection->getSchemaBuilder()->getColumns($connection->getTablePrefix().$this->model->getTable());
244 244
     }
245 245
 
246 246
     /**
Please login to merge, or discard this patch.
src/Controllers/MenuController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
         return $content
28 28
             ->title(trans('admin.menu'))
29 29
             ->description(trans('admin.list'))
30
-            ->row(function (Row $row) {
30
+            ->row(function(Row $row) {
31 31
                 $row->column(6, $this->treeView()->render());
32 32
 
33
-                $row->column(6, function (Column $column) {
33
+                $row->column(6, function(Column $column) {
34 34
                     $form = new \Encore\Admin\Widgets\Form();
35 35
                     $form->action(admin_url('auth/menu'));
36 36
 
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
         $tree->disableCreate();
78 78
 
79
-        $tree->branch(function ($branch) {
79
+        $tree->branch(function($branch) {
80 80
             $payload = "<i class='fa {$branch['icon']}'></i>&nbsp;<strong>{$branch['title']}</strong>";
81 81
 
82 82
             if (!isset($branch['children'])) {
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
         $form->display('created_at', trans('admin.created_at'));
139 139
         $form->display('updated_at', trans('admin.updated_at'));
140 140
 
141
-        $form->saved(function (Form $form) {
141
+        $form->saved(function(Form $form) {
142 142
             Admin::clearCache();
143 143
         });
144 144
 
Please login to merge, or discard this patch.