Completed
Pull Request — master (#5303)
by
unknown
03:28
created
src/Grid.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
         $column = new Column($column, $label);
315 315
         $column->setGrid($this);
316 316
 
317
-        return tap($column, function ($value) {
317
+        return tap($column, function($value) {
318 318
             $this->columns->push($value);
319 319
         });
320 320
     }
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
         $column = new Column($column, $label);
389 389
         $column->setGrid($this);
390 390
 
391
-        return tap($column, function ($value) {
391
+        return tap($column, function($value) {
392 392
             $this->columns->prepend($value);
393 393
         });
394 394
     }
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
 
567 567
         $data = $collection->toArray();
568 568
 
569
-        $this->columns->map(function (Column $column) use (&$data) {
569
+        $this->columns->map(function(Column $column) use (&$data) {
570 570
             $data = $column->fill($data);
571 571
 
572 572
             $this->columnNames[] = $column->getName();
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
      */
588 588
     protected function buildRows(array $data, Collection $collection)
589 589
     {
590
-        $this->rows = collect($data)->map(function ($model, $number) use ($collection) {
590
+        $this->rows = collect($data)->map(function($model, $number) use ($collection) {
591 591
             return new Row($number, $model, $collection->get($number)->getKey());
592 592
         });
593 593
 
Please login to merge, or discard this patch.
src/Show/Field.php 1 patch
Spacing   +15 added lines, -15 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
         });
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
     {
400 400
         $field = $this;
401 401
 
402
-        return $this->unescape()->as(function ($value) use ($field) {
402
+        return $this->unescape()->as(function($value) use ($field) {
403 403
             if (is_string($value)) {
404 404
                 $content = json_decode($value, true);
405 405
             } else {
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
      */
424 424
     public function filesize()
425 425
     {
426
-        return $this->as(function ($value) {
426
+        return $this->as(function($value) {
427 427
             return file_size($value);
428 428
         });
429 429
     }
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
 
582 582
         $field = $this;
583 583
 
584
-        return $this->as(function ($value) use ($extend, $field, $arguments) {
584
+        return $this->as(function($value) use ($extend, $field, $arguments) {
585 585
             if (!$extend->border) {
586 586
                 $field->border = false;
587 587
             }
@@ -640,7 +640,7 @@  discard block
 block discarded – undo
640 640
     public function render()
641 641
     {
642 642
         if ($this->showAs->isNotEmpty()) {
643
-            $this->showAs->each(function ($callable) {
643
+            $this->showAs->each(function($callable) {
644 644
                 $this->value = $callable->call(
645 645
                     $this->parent->getModel(),
646 646
                     $this->value
Please login to merge, or discard this patch.
src/Controllers/UserController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@  discard block
 block discarded – undo
35 35
         $grid->column('created_at', trans('admin.created_at'));
36 36
         $grid->column('updated_at', trans('admin.updated_at'));
37 37
 
38
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
38
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
39 39
             if ($actions->getKey() == 1) {
40 40
                 $actions->disableDelete();
41 41
             }
42 42
         });
43 43
 
44
-        $grid->tools(function (Grid\Tools $tools) {
45
-            $tools->batch(function (Grid\Tools\BatchActions $actions) {
44
+        $grid->tools(function(Grid\Tools $tools) {
45
+            $tools->batch(function(Grid\Tools\BatchActions $actions) {
46 46
                 $actions->disableDelete();
47 47
             });
48 48
         });
@@ -66,10 +66,10 @@  discard block
 block discarded – undo
66 66
         $show->field('id', 'ID');
67 67
         $show->field('username', trans('admin.username'));
68 68
         $show->field('name', trans('admin.name'));
69
-        $show->field('roles', trans('admin.roles'))->as(function ($roles) {
69
+        $show->field('roles', trans('admin.roles'))->as(function($roles) {
70 70
             return $roles->pluck('name');
71 71
         })->label();
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'));
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
         $form->image('avatar', trans('admin.avatar'));
104 104
         $form->password('password', trans('admin.password'))->rules('required|confirmed');
105 105
         $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
106
-            ->default(function ($form) {
106
+            ->default(function($form) {
107 107
                 return $form->model()->password;
108 108
             });
109 109
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
         $form->display('created_at', trans('admin.created_at'));
116 116
         $form->display('updated_at', trans('admin.updated_at'));
117 117
 
118
-        $form->saving(function (Form $form) {
118
+        $form->saving(function(Form $form) {
119 119
             if ($form->password && $form->model()->password != $form->password) {
120 120
                 $form->password = Hash::make($form->password);
121 121
             }
Please login to merge, or discard this patch.
src/Controllers/AuthController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     {
97 97
         $form = $this->settingForm();
98 98
         $form->tools(
99
-            function (Form\Tools $tools) {
99
+            function(Form\Tools $tools) {
100 100
                 $tools->disableList();
101 101
                 $tools->disableDelete();
102 102
                 $tools->disableView();
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
         $form->image('avatar', trans('admin.avatar'));
135 135
         $form->password('password', trans('admin.password'))->rules('confirmed|required');
136 136
         $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
137
-            ->default(function ($form) {
137
+            ->default(function($form) {
138 138
                 return $form->model()->password;
139 139
             });
140 140
 
@@ -142,13 +142,13 @@  discard block
 block discarded – undo
142 142
 
143 143
         $form->ignore(['password_confirmation']);
144 144
 
145
-        $form->saving(function (Form $form) {
145
+        $form->saving(function(Form $form) {
146 146
             if ($form->password && $form->model()->password != $form->password) {
147 147
                 $form->password = Hash::make($form->password);
148 148
             }
149 149
         });
150 150
 
151
-        $form->saved(function () {
151
+        $form->saved(function() {
152 152
             admin_toastr(trans('admin.update_succeeded'));
153 153
 
154 154
             return redirect(admin_url('auth/setting'));
Please login to merge, or discard this patch.
src/Grid/Model.php 1 patch
Spacing   +13 added lines, -13 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
 
@@ -349,9 +349,9 @@  discard block
 block discarded – undo
349 349
 
350 350
         $this->setSort();
351 351
 
352
-        $this->queries->reject(function ($query) {
352
+        $this->queries->reject(function($query) {
353 353
             return $query['method'] == 'paginate';
354
-        })->each(function ($query) {
354
+        })->each(function($query) {
355 355
             $this->model = $this->model->{$query['method']}(...$query['arguments']);
356 356
         });
357 357
 
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
         $this->setSort();
404 404
         $this->setPaginate();
405 405
 
406
-        $this->queries->unique()->each(function ($query) {
406
+        $this->queries->unique()->each(function($query) {
407 407
             $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']);
408 408
         });
409 409
 
@@ -433,9 +433,9 @@  discard block
 block discarded – undo
433 433
 
434 434
         $queryBuilder = $this->originalModel;
435 435
 
436
-        $this->queries->reject(function ($query) {
436
+        $this->queries->reject(function($query) {
437 437
             return in_array($query['method'], ['get', 'paginate']);
438
-        })->each(function ($query) use (&$queryBuilder) {
438
+        })->each(function($query) use (&$queryBuilder) {
439 439
             $queryBuilder = $queryBuilder->{$query['method']}(...$query['arguments']);
440 440
         });
441 441
 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
     {
470 470
         $paginate = $this->findQueryByMethod('paginate');
471 471
 
472
-        $this->queries = $this->queries->reject(function ($query) {
472
+        $this->queries = $this->queries->reject(function($query) {
473 473
             return $query['method'] == 'paginate';
474 474
         });
475 475
 
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
      */
528 528
     protected function findQueryByMethod($method)
529 529
     {
530
-        return $this->queries->first(function ($query) use ($method) {
530
+        return $this->queries->first(function($query) use ($method) {
531 531
             return $query['method'] == $method;
532 532
         });
533 533
     }
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
         }
551 551
 
552 552
         $columnNameContainsDots = Str::contains($columnName, '.');
553
-        $isRelation = $this->queries->contains(function ($query) use ($columnName) {
553
+        $isRelation = $this->queries->contains(function($query) use ($columnName) {
554 554
             return $query['method'] === 'with' && in_array($columnName, $query['arguments'], true);
555 555
         });
556 556
         if ($columnNameContainsDots === true && $isRelation) {
@@ -594,9 +594,9 @@  discard block
 block discarded – undo
594 594
      */
595 595
     protected function setRelationSort($column)
596 596
     {
597
-        [ $relationName, $relationColumn ] = explode('.', $column);
597
+        [$relationName, $relationColumn] = explode('.', $column);
598 598
 
599
-        if ($this->queries->contains(function ($query) use ($relationName) {
599
+        if ($this->queries->contains(function($query) use ($relationName) {
600 600
             return $query['method'] == 'with' && in_array($relationName, $query['arguments']);
601 601
         })) {
602 602
             $relation = $this->model->$relationName();
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
      */
631 631
     public function resetOrderBy()
632 632
     {
633
-        $this->queries = $this->queries->reject(function ($query) {
633
+        $this->queries = $this->queries->reject(function($query) {
634 634
             return $query['method'] == 'orderBy' || $query['method'] == 'orderByDesc';
635 635
         });
636 636
     }
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
@@ -157,16 +157,16 @@  discard block
 block discarded – undo
157 157
             call_user_func($this->callback, $this);
158 158
         }
159 159
 
160
-        $response = function () {
160
+        $response = function() {
161 161
             $handle = fopen('php://output', 'w');
162 162
             $titles = [];
163 163
 
164
-            $this->chunkById(function ($collection) use ($handle, &$titles) {
164
+            $this->chunkById(function($collection) use ($handle, &$titles) {
165 165
                 Column::setOriginalGridModels($collection);
166 166
 
167 167
                 $original = $current = $collection->toArray();
168 168
 
169
-                $this->grid->getColumns()->map(function (Column $column) use (&$current) {
169
+                $this->grid->getColumns()->map(function(Column $column) use (&$current) {
170 170
                     $current = $column->fill($current);
171 171
                     $this->grid->columnNames[] = $column->getName();
172 172
                 });
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
     protected function getVisiableTitles()
196 196
     {
197 197
         $titles = $this->grid->visibleColumns()
198
-            ->mapWithKeys(function (Column $column) {
198
+            ->mapWithKeys(function(Column $column) {
199 199
                 $columnName = $column->getName();
200 200
                 $columnTitle = $column->getLabel();
201 201
                 if (isset($this->titleCallbacks[$columnName])) {
Please login to merge, or discard this patch.
src/Grid/Exporters/AbstractExporter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@
 block discarded – undo
139 139
             return $this;
140 140
         }
141 141
 
142
-        [ $scope, $args ] = explode(':', $scope);
142
+        [$scope, $args] = explode(':', $scope);
143 143
 
144 144
         if ($scope == Grid\Exporter::SCOPE_CURRENT_PAGE) {
145 145
             $this->grid->model()->usePaginate(true);
Please login to merge, or discard this patch.