Completed
Pull Request — master (#5858)
by
unknown
54s
created
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/Show/Field.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
      */
193 193
     public function using(array $values, $default = null)
194 194
     {
195
-        return $this->as(function ($value) use ($values, $default) {
195
+        return $this->as(function($value) use ($values, $default) {
196 196
             if (is_null($value)) {
197 197
                 return $default;
198 198
             }
@@ -212,8 +212,8 @@  discard block
 block discarded – undo
212 212
      */
213 213
     public function image($server = '', $width = 200, $height = 200)
214 214
     {
215
-        return $this->unescape()->as(function ($images) use ($server, $width, $height) {
216
-            return collect($images)->map(function ($path) use ($server, $width, $height) {
215
+        return $this->unescape()->as(function($images) use ($server, $width, $height) {
216
+            return collect($images)->map(function($path) use ($server, $width, $height) {
217 217
                 if (empty($path)) {
218 218
                     return '';
219 219
                 }
@@ -248,8 +248,8 @@  discard block
 block discarded – undo
248 248
      */
249 249
     public function carousel($width = 300, $height = 200, $server = '')
250 250
     {
251
-        return $this->unescape()->as(function ($images) use ($server, $width, $height) {
252
-            $items = collect($images)->map(function ($path) use ($server, $width, $height) {
251
+        return $this->unescape()->as(function($images) use ($server, $width, $height) {
252
+            $items = collect($images)->map(function($path) use ($server, $width, $height) {
253 253
                 if (empty($path)) {
254 254
                     return '';
255 255
                 }
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
     {
290 290
         $field = $this;
291 291
 
292
-        return $this->unescape()->as(function ($path) use ($server, $download, $field) {
292
+        return $this->unescape()->as(function($path) use ($server, $download, $field) {
293 293
             $name = basename($path);
294 294
 
295 295
             $field->border = false;
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
      */
344 344
     public function link($href = '', $target = '_blank')
345 345
     {
346
-        return $this->unescape()->as(function ($link) use ($href, $target) {
346
+        return $this->unescape()->as(function($link) use ($href, $target) {
347 347
             $href = $href ?: $link;
348 348
 
349 349
             return "<a href='$href' target='{$target}'>{$link}</a>";
@@ -359,12 +359,12 @@  discard block
 block discarded – undo
359 359
      */
360 360
     public function label($style = 'success')
361 361
     {
362
-        return $this->unescape()->as(function ($value) use ($style) {
362
+        return $this->unescape()->as(function($value) use ($style) {
363 363
             if ($value instanceof Arrayable) {
364 364
                 $value = $value->toArray();
365 365
             }
366 366
 
367
-            return collect((array) $value)->map(function ($name) use ($style) {
367
+            return collect((array) $value)->map(function($name) use ($style) {
368 368
                 return "<span class='label label-{$style}'>$name</span>";
369 369
             })->implode('&nbsp;');
370 370
         });
@@ -379,12 +379,12 @@  discard block
 block discarded – undo
379 379
      */
380 380
     public function badge($style = 'blue')
381 381
     {
382
-        return $this->unescape()->as(function ($value) use ($style) {
382
+        return $this->unescape()->as(function($value) use ($style) {
383 383
             if ($value instanceof Arrayable) {
384 384
                 $value = $value->toArray();
385 385
             }
386 386
 
387
-            return collect((array) $value)->map(function ($name) use ($style) {
387
+            return collect((array) $value)->map(function($name) use ($style) {
388 388
                 return "<span class='badge bg-{$style}'>$name</span>";
389 389
             })->implode('&nbsp;');
390 390
         });
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
      */
401 401
     public function number($decimals = 0, $decimal_seperator = '.', $thousands_seperator = ',')
402 402
     {
403
-        return $this->unescape()->as(function ($value) use ($decimals, $decimal_seperator, $thousands_seperator) {
403
+        return $this->unescape()->as(function($value) use ($decimals, $decimal_seperator, $thousands_seperator) {
404 404
             return number_format($value, $decimals, $decimal_seperator, $thousands_seperator);
405 405
         });
406 406
     }
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
     {
415 415
         $field = $this;
416 416
 
417
-        return $this->unescape()->as(function ($value) use ($field) {
417
+        return $this->unescape()->as(function($value) use ($field) {
418 418
             if (is_string($value)) {
419 419
                 $content = json_decode($value, true);
420 420
             } else {
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
      */
439 439
     public function filesize()
440 440
     {
441
-        return $this->as(function ($value) {
441
+        return $this->as(function($value) {
442 442
             return file_size($value);
443 443
         });
444 444
     }
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
 
597 597
         $field = $this;
598 598
 
599
-        return $this->as(function ($value) use ($extend, $field, $arguments) {
599
+        return $this->as(function($value) use ($extend, $field, $arguments) {
600 600
             if (!$extend->border) {
601 601
                 $field->border = false;
602 602
             }
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
     public function render()
656 656
     {
657 657
         if ($this->showAs->isNotEmpty()) {
658
-            $this->showAs->each(function ($callable) {
658
+            $this->showAs->each(function($callable) {
659 659
                 $this->value = $callable->call(
660 660
                     $this->parent->getModel(),
661 661
                     $this->value
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/Controllers/RoleController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,21 +31,21 @@  discard block
 block discarded – undo
31 31
         $grid->column('slug', trans('admin.slug'));
32 32
         $grid->column('name', trans('admin.name'));
33 33
 
34
-        $grid->column('permissions', trans('admin.permission'))->pluck('name')->label()->display(function ($raw) {
34
+        $grid->column('permissions', trans('admin.permission'))->pluck('name')->label()->display(function($raw) {
35 35
             return str_replace('&nbsp;', '<br>', $raw);
36 36
         });
37 37
 
38 38
         $grid->column('created_at', trans('admin.created_at'));
39 39
         $grid->column('updated_at', trans('admin.updated_at'));
40 40
 
41
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
41
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
42 42
             if ($actions->row->slug == 'administrator') {
43 43
                 $actions->disableDelete();
44 44
             }
45 45
         });
46 46
 
47
-        $grid->tools(function (Grid\Tools $tools) {
48
-            $tools->batch(function (Grid\Tools\BatchActions $actions) {
47
+        $grid->tools(function(Grid\Tools $tools) {
48
+            $tools->batch(function(Grid\Tools\BatchActions $actions) {
49 49
                 $actions->disableDelete();
50 50
             });
51 51
         });
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
         $show->field('id', 'ID');
70 70
         $show->field('slug', trans('admin.slug'));
71 71
         $show->field('name', trans('admin.name'));
72
-        $show->field('permissions', trans('admin.permissions'))->as(function ($permission) {
72
+        $show->field('permissions', trans('admin.permissions'))->as(function($permission) {
73 73
             return $permission->pluck('name');
74 74
         })->label();
75 75
         $show->field('created_at', trans('admin.created_at'));
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/Auth/Database/HasPermissions.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
             if (!$cache) {
66 66
                 $user_permissions[$this->id] = $this->permissions->pluck('slug');
67 67
             } else {
68
-                $permissions_key = 'admin_permissions_can_' . $this->id;
68
+                $permissions_key = 'admin_permissions_can_'.$this->id;
69 69
                 $user_permissions[$this->id] = $cache->get($permissions_key);
70 70
                 if (!$user_permissions[$this->id]) {
71 71
                     $user_permissions[$this->id] = $this->permissions->pluck('slug');
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
             if (!$cache) {
83 83
                 $user_roles[$this->id] = $this->roles->pluck('permissions')->flatten()->pluck('slug');
84 84
             } else {
85
-                $roles_key = 'admin_roles_permissions_' . $this->id;
85
+                $roles_key = 'admin_roles_permissions_'.$this->id;
86 86
                 $user_roles[$this->id] = $cache->get($roles_key);
87 87
                 if (!$user_roles[$this->id]) {
88 88
                     $user_roles[$this->id] = $this->roles->pluck('permissions')->flatten()->pluck('slug');
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
             if (!$cache) {
154 154
                 $user_roles[$this->id] = $this->roles->pluck('slug');
155 155
             } else {
156
-                $cache_key = 'admin_roles__' . $this->id;
156
+                $cache_key = 'admin_roles__'.$this->id;
157 157
                 $user_roles[$this->id] = $cache->get($cache_key);
158 158
                 if (!$user_roles[$this->id]) {
159 159
                     $user_roles[$this->id] = $this->roles->pluck('slug');
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
      */
190 190
     protected static function bootHasPermissions()
191 191
     {
192
-        static::deleting(function ($model) {
192
+        static::deleting(function($model) {
193 193
             $model->roles()->detach();
194 194
 
195 195
             $model->permissions()->detach();
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -16,8 +16,9 @@  discard block
 block discarded – undo
16 16
     {
17 17
         $cache = config('admin.cache');
18 18
         $cache = $cache['enable'] ? Cache::store($cache['store']) : null;
19
-        if (!$cache)
20
-            return $this->_allPermissions();
19
+        if (!$cache) {
20
+                    return $this->_allPermissions();
21
+        }
21 22
 
22 23
         $cache_key = 'admin_permissions_all_'.$this->id;
23 24
         $permissions = $cache->get($cache_key);
@@ -113,8 +114,9 @@  discard block
 block discarded – undo
113 114
     public function isAdministrator(): bool
114 115
     {
115 116
         static $res = [];
116
-        if (!isset($res[$this->id]))
117
-            $res[$this->id] = $this->isRole('administrator');
117
+        if (!isset($res[$this->id])) {
118
+                    $res[$this->id] = $this->isRole('administrator');
119
+        }
118 120
         return $res[$this->id];
119 121
     }
120 122
 
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.