Completed
Pull Request — master (#1350)
by
unknown
02:50
created
src/Controllers/Dashboard.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -20,20 +20,20 @@
 block discarded – undo
20 20
     public static function environment()
21 21
     {
22 22
         $envs = [
23
-            ['name' => 'PHP version',       'value' => 'PHP/'.PHP_VERSION],
24
-            ['name' => 'Laravel version',   'value' => app()->version()],
25
-            ['name' => 'CGI',               'value' => php_sapi_name()],
26
-            ['name' => 'Uname',             'value' => php_uname()],
27
-            ['name' => 'Server',            'value' => array_get($_SERVER, 'SERVER_SOFTWARE')],
23
+            ['name' => 'PHP version', 'value' => 'PHP/'.PHP_VERSION],
24
+            ['name' => 'Laravel version', 'value' => app()->version()],
25
+            ['name' => 'CGI', 'value' => php_sapi_name()],
26
+            ['name' => 'Uname', 'value' => php_uname()],
27
+            ['name' => 'Server', 'value' => array_get($_SERVER, 'SERVER_SOFTWARE')],
28 28
 
29
-            ['name' => 'Cache driver',      'value' => config('cache.default')],
30
-            ['name' => 'Session driver',    'value' => config('session.driver')],
31
-            ['name' => 'Queue driver',      'value' => config('queue.default')],
29
+            ['name' => 'Cache driver', 'value' => config('cache.default')],
30
+            ['name' => 'Session driver', 'value' => config('session.driver')],
31
+            ['name' => 'Queue driver', 'value' => config('queue.default')],
32 32
 
33
-            ['name' => 'Timezone',          'value' => config('app.timezone')],
34
-            ['name' => 'Locale',            'value' => config('app.locale')],
35
-            ['name' => 'Env',               'value' => config('app.env')],
36
-            ['name' => 'URL',               'value' => config('app.url')],
33
+            ['name' => 'Timezone', 'value' => config('app.timezone')],
34
+            ['name' => 'Locale', 'value' => config('app.locale')],
35
+            ['name' => 'Env', 'value' => config('app.env')],
36
+            ['name' => 'URL', 'value' => config('app.url')],
37 37
         ];
38 38
 
39 39
         return view('admin::dashboard.environment', compact('envs'));
Please login to merge, or discard this patch.
src/Grid/Model.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -225,9 +225,9 @@  discard block
 block discarded – undo
225 225
 
226 226
         $this->setSort();
227 227
 
228
-        $this->queries->reject(function ($query) {
228
+        $this->queries->reject(function($query) {
229 229
             return $query['method'] == 'paginate';
230
-        })->each(function ($query) {
230
+        })->each(function($query) {
231 231
             $this->model = $this->model->{$query['method']}(...$query['arguments']);
232 232
         });
233 233
 
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
         $this->setSort();
275 275
         $this->setPaginate();
276 276
 
277
-        $this->queries->unique()->each(function ($query) {
277
+        $this->queries->unique()->each(function($query) {
278 278
             $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']);
279 279
         });
280 280
 
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
     {
319 319
         $paginate = $this->findQueryByMethod('paginate');
320 320
 
321
-        $this->queries = $this->queries->reject(function ($query) {
321
+        $this->queries = $this->queries->reject(function($query) {
322 322
             return $query['method'] == 'paginate';
323 323
         });
324 324
 
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
      */
373 373
     protected function findQueryByMethod($method)
374 374
     {
375
-        return $this->queries->first(function ($query) use ($method) {
375
+        return $this->queries->first(function($query) use ($method) {
376 376
             return $query['method'] == $method;
377 377
         });
378 378
     }
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
     {
417 417
         list($relationName, $relationColumn) = explode('.', $column);
418 418
 
419
-        if ($this->queries->contains(function ($query) use ($relationName) {
419
+        if ($this->queries->contains(function($query) use ($relationName) {
420 420
             return $query['method'] == 'with' && in_array($relationName, $query['arguments']);
421 421
         })) {
422 422
             $relation = $this->model->$relationName();
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
      */
446 446
     public function resetOrderBy()
447 447
     {
448
-        $this->queries = $this->queries->reject(function ($query) {
448
+        $this->queries = $this->queries->reject(function($query) {
449 449
             return $query['method'] == 'orderBy';
450 450
         });
451 451
     }
Please login to merge, or discard this patch.
src/Grid/Exporters/CsvExporter.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
21 21
             'Content-Disposition' => "attachment; filename=\"$filename\"",
22 22
         ];
23 23
 
24
-        response()->stream(function () {
24
+        response()->stream(function() {
25 25
             $handle = fopen('php://output', 'w');
26 26
 
27 27
             $titles = [];
28 28
 
29
-            $this->chunk(function ($records) use ($handle, &$titles) {
29
+            $this->chunk(function($records) use ($handle, &$titles) {
30 30
                 if (empty($titles)) {
31 31
                     $titles = $this->getHeaderRowFromRecords($records);
32 32
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
     public function getHeaderRowFromRecords(Collection $records): array
55 55
     {
56 56
         $titles = collect(array_dot($records->first()->toArray()))->keys()->map(
57
-            function ($key) {
57
+            function($key) {
58 58
                 $key = str_replace('.', ' ', $key);
59 59
 
60 60
                 return Str::ucfirst($key);
Please login to merge, or discard this patch.
src/Widgets/Navbar.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
             return '';
71 71
         }
72 72
 
73
-        return $this->elements[$part]->map(function ($element) {
73
+        return $this->elements[$part]->map(function($element) {
74 74
             if ($element instanceof Htmlable) {
75 75
                 return $element->toHtml();
76 76
             }
Please login to merge, or discard this patch.
src/Controllers/AuthController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -76,11 +76,11 @@  discard block
 block discarded – undo
76 76
      */
77 77
     public function getSetting()
78 78
     {
79
-        return Admin::content(function (Content $content) {
79
+        return Admin::content(function(Content $content) {
80 80
             $content->header(trans('admin.user_setting'));
81 81
             $form = $this->settingForm();
82 82
             $form->tools(
83
-                function (Form\Tools $tools) {
83
+                function(Form\Tools $tools) {
84 84
                     $tools->disableBackButton();
85 85
                     $tools->disableListButton();
86 86
                 }
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
106 106
      */
107 107
     protected function settingForm()
108 108
     {
109
-        return Administrator::form(function (Form $form) {
109
+        return Administrator::form(function(Form $form) {
110 110
             $form->display('username', trans('admin.username'));
111 111
             $form->text('name', trans('admin.name'))->rules('required');
112 112
             $form->image('avatar', trans('admin.avatar'));
113 113
             $form->password('password', trans('admin.password'))->rules('confirmed|required');
114 114
             $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
115
-                ->default(function ($form) {
115
+                ->default(function($form) {
116 116
                     return $form->model()->password;
117 117
                 });
118 118
 
@@ -120,13 +120,13 @@  discard block
 block discarded – undo
120 120
 
121 121
             $form->ignore(['password_confirmation']);
122 122
 
123
-            $form->saving(function (Form $form) {
123
+            $form->saving(function(Form $form) {
124 124
                 if ($form->password && $form->model()->password != $form->password) {
125 125
                     $form->password = bcrypt($form->password);
126 126
                 }
127 127
             });
128 128
 
129
-            $form->saved(function () {
129
+            $form->saved(function() {
130 130
                 admin_toastr(trans('admin.update_succeeded'));
131 131
 
132 132
                 return redirect(admin_base_path('auth/setting'));
Please login to merge, or discard this patch.
src/Grid.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 
272 272
             $relation = $this->model()->eloquent()->$relationName();
273 273
 
274
-            $label = $this->setLabel($label,$relationColumn);
274
+            $label = $this->setLabel($label, $relationColumn);
275 275
 //            $label = empty($label) ? ucfirst($relationColumn) : $label;
276 276
             $name = snake_case($relationName).'.'.$relationColumn;
277 277
         }
@@ -286,13 +286,13 @@  discard block
 block discarded – undo
286 286
         return $column;
287 287
     }
288 288
 
289
-    public function setLabel($label , $relationColumn)
289
+    public function setLabel($label, $relationColumn)
290 290
     {
291
-        $trans_key = 'validation.attributes.' . strtolower($relationColumn);
291
+        $trans_key = 'validation.attributes.'.strtolower($relationColumn);
292 292
 
293 293
          if (empty($label) && Lang::has($trans_key)) {
294 294
             $label = Lang::get($trans_key);
295
-        }else if (empty($label)) {
295
+        } else if (empty($label)) {
296 296
              $label = ucfirst($relationColumn);
297 297
          }
298 298
         return $label;
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
         $callback = $this->actionsCallback;
452 452
         $column = $this->addColumn('__actions__', trans('admin.action'));
453 453
 
454
-        $column->display(function ($value) use ($grid, $column, $callback) {
454
+        $column->display(function($value) use ($grid, $column, $callback) {
455 455
             $actions = new Actions($value, $grid, $column, $this);
456 456
 
457 457
             return $actions->display($callback);
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
      */
466 466
     public function disableRowSelector()
467 467
     {
468
-        $this->tools(function ($tools) {
468
+        $this->tools(function($tools) {
469 469
             /* @var Grid\Tools $tools */
470 470
             $tools->disableBatchActions();
471 471
         });
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
         $column = new Column(Column::SELECT_COLUMN_NAME, ' ');
490 490
         $column->setGrid($this);
491 491
 
492
-        $column->display(function ($value) use ($grid, $column) {
492
+        $column->display(function($value) use ($grid, $column) {
493 493
             $actions = new RowSelector($value, $grid, $column, $this);
494 494
 
495 495
             return $actions->display();
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 
517 517
         Column::setOriginalGridData($data);
518 518
 
519
-        $this->columns->map(function (Column $column) use (&$data) {
519
+        $this->columns->map(function(Column $column) use (&$data) {
520 520
             $data = $column->fill($data);
521 521
 
522 522
             $this->columnNames[] = $column->getName();
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
      */
595 595
     protected function buildRows(array $data)
596 596
     {
597
-        $this->rows = collect($data)->map(function ($model, $number) {
597
+        $this->rows = collect($data)->map(function($model, $number) {
598 598
             return new Row($number, $model);
599 599
         });
600 600
 
@@ -881,7 +881,7 @@  discard block
 block discarded – undo
881 881
     {
882 882
 //        $label = isset($arguments[0]) ? $arguments[0] : ucfirst($method);
883 883
         $label = isset($arguments[0]) ? $arguments[0] : null;
884
-        $label = $this->setLabel($label,$method);
884
+        $label = $this->setLabel($label, $method);
885 885
 
886 886
         if ($this->model()->eloquent() instanceof MongodbModel) {
887 887
             return $this->addColumn($method, $label);
Please login to merge, or discard this patch.
src/Form/Field/Tags.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
             $this->value = explode(',', $this->value);
27 27
         }
28 28
 
29
-        $this->value = array_filter((array)$this->value);
29
+        $this->value = array_filter((array) $this->value);
30 30
     }
31 31
 
32 32
     /**
Please login to merge, or discard this patch.
src/Form/Field/Select.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         if (is_callable($options)) {
71 71
             $this->options = $options;
72 72
         } else {
73
-            $this->options = (array)$options;
73
+            $this->options = (array) $options;
74 74
         }
75 75
 
76 76
         return $this;
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
     protected function loadOptionsFromRemote($url, $parameters = [], $options = [])
146 146
     {
147 147
         $ajaxOptions = [
148
-            'url' => $url . '?' . http_build_query($parameters),
148
+            'url' => $url.'?'.http_build_query($parameters),
149 149
         ];
150 150
 
151 151
         $ajaxOptions = json_encode(array_merge($ajaxOptions, $options));
Please login to merge, or discard this patch.
src/Form/Builder.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
      */
260 260
     public function field($name)
261 261
     {
262
-        return $this->fields()->first(function (Field $field) use ($name) {
262
+        return $this->fields()->first(function(Field $field) use ($name) {
263 263
             return $field->column() == $name;
264 264
         });
265 265
     }
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
             $this->form->model()->getUpdatedAtColumn(),
503 503
         ];
504 504
 
505
-        $this->fields = $this->fields()->reject(function (Field $field) use ($reservedColumns) {
505
+        $this->fields = $this->fields()->reject(function(Field $field) use ($reservedColumns) {
506 506
             return in_array($field->column(), $reservedColumns);
507 507
         });
508 508
 
@@ -528,7 +528,7 @@  discard block
 block discarded – undo
528 528
     {
529 529
         $rules = [];
530 530
         foreach ($this->fields() as $item) {
531
-            if(!empty($item->getRules())){
531
+            if (!empty($item->getRules())) {
532 532
                 $rules[$item->id] = $item->getRules();
533 533
             }
534 534
         }
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
     public function getRuleMessages()
545 545
     {
546 546
         $rules = [];
547
-        foreach ($this->fields() as $item ) {
547
+        foreach ($this->fields() as $item) {
548 548
             foreach ($item->validationMessages as $key => $value) {
549 549
                 $rules[$key] = $value;
550 550
             }
Please login to merge, or discard this patch.