Completed
Pull Request — master (#3175)
by jxlwqq
02:22
created
src/Controllers/LogController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@  discard block
 block discarded – undo
35 35
 
36 36
         $grid->id('ID')->sortable();
37 37
         $grid->user()->name('User');
38
-        $grid->method()->display(function ($method) {
38
+        $grid->method()->display(function($method) {
39 39
             $color = array_get(OperationLog::$methodColors, $method, 'grey');
40 40
 
41 41
             return "<span class=\"badge bg-$color\">$method</span>";
42 42
         });
43 43
         $grid->path()->label('info');
44 44
         $grid->ip()->label('primary');
45
-        $grid->input()->display(function ($input) {
45
+        $grid->input()->display(function($input) {
46 46
             $input = json_decode($input, true);
47 47
             $input = array_except($input, ['_pjax', '_token', '_method', '_previous_']);
48 48
             if (empty($input)) {
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
54 54
 
55 55
         $grid->created_at(trans('admin.created_at'));
56 56
 
57
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
57
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
58 58
             $actions->disableEdit();
59 59
             $actions->disableView();
60 60
         });
61 61
 
62 62
         $grid->disableCreation();
63 63
 
64
-        $grid->filter(function ($filter) {
64
+        $grid->filter(function($filter) {
65 65
             $userModel = config('admin.database.users_model');
66 66
 
67 67
             $filter->equal('user_id', 'User')->select($userModel::all()->pluck('name', 'id'));
Please login to merge, or discard this patch.
src/Admin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -213,10 +213,10 @@
 block discarded – undo
213 213
             'middleware' => config('admin.route.middleware'),
214 214
         ];
215 215
 
216
-        app('router')->group($attributes, function ($router) {
216
+        app('router')->group($attributes, function($router) {
217 217
 
218 218
             /* @var \Illuminate\Routing\Router $router */
219
-            $router->namespace('Encore\Admin\Controllers')->group(function ($router) {
219
+            $router->namespace('Encore\Admin\Controllers')->group(function($router) {
220 220
 
221 221
                 /* @var \Illuminate\Routing\Router $router */
222 222
                 $router->resource('auth/users', 'UserController');
Please login to merge, or discard this patch.
src/Grid/Displayers/Image.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)->filter()->map(function ($path) use ($server, $width, $height) {
16
+        return collect((array) $this->value)->filter()->map(function($path) use ($server, $width, $height) {
17 17
             if (url()->isValidUrl($path) || strpos($path, 'data:image') === 0) {
18 18
                 $src = $path;
19 19
             } elseif ($server) {
Please login to merge, or discard this patch.
src/Form/Field/UploadField.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
             'browseLabel'          => trans('admin.browse'),
80 80
             'showRemove'           => false,
81 81
             'showUpload'           => false,
82
-            'dropZoneEnabled'      => false,        //dropzone disabled by default for backward compatibility
82
+            'dropZoneEnabled'      => false, //dropzone disabled by default for backward compatibility
83 83
 //            'initialCaption'       => $this->initialCaption($this->value),
84 84
             'deleteExtraData'      => [
85 85
                 $this->formatName($this->column) => static::FILE_DELETE_FLAG,
Please login to merge, or discard this patch.
src/Grid/Filter.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
      */
260 260
     protected function removeFilterByID($id)
261 261
     {
262
-        $this->filters = array_filter($this->filters, function (AbstractFilter $filter) use ($id) {
262
+        $this->filters = array_filter($this->filters, function(AbstractFilter $filter) use ($id) {
263 263
             return $filter->getId() != $id;
264 264
         });
265 265
     }
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
     {
274 274
         $inputs = array_dot(Input::all());
275 275
 
276
-        $inputs = array_filter($inputs, function ($input) {
276
+        $inputs = array_filter($inputs, function($input) {
277 277
             return $input !== '' && !is_null($input);
278 278
         });
279 279
 
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
             }
302 302
         }
303 303
 
304
-        return tap(array_filter($conditions), function ($conditions) {
304
+        return tap(array_filter($conditions), function($conditions) {
305 305
             if (!empty($conditions)) {
306 306
                 $this->expand();
307 307
             }
@@ -319,9 +319,9 @@  discard block
 block discarded – undo
319 319
             return $inputs;
320 320
         }
321 321
 
322
-        $inputs = collect($inputs)->filter(function ($input, $key) {
322
+        $inputs = collect($inputs)->filter(function($input, $key) {
323 323
             return starts_with($key, "{$this->name}_");
324
-        })->mapWithKeys(function ($val, $key) {
324
+        })->mapWithKeys(function($val, $key) {
325 325
             $key = str_replace("{$this->name}_", '', $key);
326 326
 
327 327
             return [$key => $val];
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
      */
392 392
     public function scope($key, $label = '')
393 393
     {
394
-        return tap(new Scope($key, $label), function (Scope $scope) {
394
+        return tap(new Scope($key, $label), function(Scope $scope) {
395 395
             return $this->scopes->push($scope);
396 396
         });
397 397
     }
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
     {
416 416
         $key = request(Scope::QUERY_NAME);
417 417
 
418
-        return $this->scopes->first(function ($scope) use ($key) {
418
+        return $this->scopes->first(function($scope) use ($key) {
419 419
             return $scope->key == $key;
420 420
         });
421 421
     }
@@ -535,9 +535,9 @@  discard block
 block discarded – undo
535 535
 
536 536
         $columns->push($pageKey);
537 537
 
538
-        $groupNames = collect($this->filters)->filter(function ($filter) {
538
+        $groupNames = collect($this->filters)->filter(function($filter) {
539 539
             return $filter instanceof Group;
540
-        })->map(function (AbstractFilter $filter) {
540
+        })->map(function(AbstractFilter $filter) {
541 541
             return "{$filter->getId()}_group";
542 542
         });
543 543
 
Please login to merge, or discard this patch.
src/Grid/Displayers/Editable.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@
 block discarded – undo
184 184
             $attributes = array_merge($attributes, $this->attributes);
185 185
         }
186 186
 
187
-        $attributes = collect($attributes)->map(function ($attribute, $name) {
187
+        $attributes = collect($attributes)->map(function($attribute, $name) {
188 188
             return "$name='$attribute'";
189 189
         })->implode(' ');
190 190
 
Please login to merge, or discard this patch.
resources/views/partials/exception.blade.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 @if($errors->hasBag('exception') && env('APP_DEBUG') == true)
2
-    <?php $error = $errors->getBag('exception');?>
2
+    <?php $error = $errors->getBag('exception'); ?>
3 3
     <div class="alert alert-warning alert-dismissable">
4 4
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
5 5
         <h4>
Please login to merge, or discard this patch.
src/Console/ExportSeedCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
         $fields = \DB::getSchemaBuilder()->getColumnListing($table);
90 90
         $fields = array_diff($fields, $exceptFields);
91 91
 
92
-        $array = \DB::table($table)->get($fields)->map(function ($item) {
92
+        $array = \DB::table($table)->get($fields)->map(function($item) {
93 93
             return (array) $item;
94 94
         })->all();
95 95
 
Please login to merge, or discard this patch.
src/Form/Field/HasMany.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -640,7 +640,7 @@
 block discarded – undo
640 640
         }
641 641
 
642 642
         /* Build row elements */
643
-        $template = array_reduce($fields, function ($all, $field) {
643
+        $template = array_reduce($fields, function($all, $field) {
644 644
             $all .= "<td>{$field}</td>";
645 645
 
646 646
             return $all;
Please login to merge, or discard this patch.