Completed
Pull Request — master (#2212)
by
unknown
02:57
created
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/Widgets/Form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@
 block discarded – undo
162 162
      */
163 163
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
164 164
     {
165
-        collect($this->fields)->each(function ($field) use ($fieldWidth, $labelWidth) {
165
+        collect($this->fields)->each(function($field) use ($fieldWidth, $labelWidth) {
166 166
             /* @var Field $field  */
167 167
             $field->setWidth($fieldWidth, $labelWidth);
168 168
         });
Please login to merge, or discard this patch.
resources/views/partials/error.blade.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 @if(Session::has('error'))
2
-    <?php $error = Session::get('error');?>
2
+    <?php $error = Session::get('error'); ?>
3 3
     <div class="alert alert-danger alert-dismissable">
4 4
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
5 5
         <h4><i class="icon fa fa-ban"></i>{{ array_get($error->get('title'), 0) }}</h4>
6 6
         <p>{!!  array_get($error->get('message'), 0) !!}</p>
7 7
     </div>
8 8
 @elseif (Session::has('errors'))
9
-    <?php $errors = Session::get('errors');?>
9
+    <?php $errors = Session::get('errors'); ?>
10 10
     @if ($errors->hasBag('error'))
11 11
       <div class="alert alert-danger alert-dismissable">
12 12
 
Please login to merge, or discard this patch.
src/Middleware/Permission.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
             return $next($request);
34 34
         }
35 35
 
36
-        if (!Admin::user()->allPermissions()->first(function ($permission) use ($request) {
36
+        if (!Admin::user()->allPermissions()->first(function($permission) use ($request) {
37 37
             return $permission->shouldPassThrough($request);
38 38
         })) {
39 39
             Checker::error();
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
      */
53 53
     public function checkRoutePermission(Request $request)
54 54
     {
55
-        if (!$middleware = collect($request->route()->middleware())->first(function ($middleware) {
55
+        if (!$middleware = collect($request->route()->middleware())->first(function($middleware) {
56 56
             return Str::startsWith($middleware, $this->middlewarePrefix);
57 57
         })) {
58 58
             return false;
Please login to merge, or discard this patch.
src/Auth/Database/Role.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
     {
87 87
         parent::boot();
88 88
 
89
-        static::deleting(function ($model) {
89
+        static::deleting(function($model) {
90 90
             $model->administrators()->detach();
91 91
 
92 92
             $model->permissions()->detach();
Please login to merge, or discard this patch.
src/Auth/Database/Permission.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 
67 67
         $method = $this->http_method;
68 68
 
69
-        $matches = array_map(function ($path) use ($method) {
69
+        $matches = array_map(function($path) use ($method) {
70 70
             $path = trim(config('admin.route.prefix'), '/').$path;
71 71
 
72 72
             if (Str::contains($path, ':')) {
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
             return false;
101 101
         }
102 102
 
103
-        $method = collect($match['method'])->filter()->map(function ($method) {
103
+        $method = collect($match['method'])->filter()->map(function($method) {
104 104
             return strtoupper($method);
105 105
         });
106 106
 
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
     {
141 141
         parent::boot();
142 142
 
143
-        static::deleting(function ($model) {
143
+        static::deleting(function($model) {
144 144
             $model->roles()->detach();
145 145
         });
146 146
     }
Please login to merge, or discard this patch.
src/Auth/Database/HasPermissions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
155 155
     {
156 156
         parent::boot();
157 157
 
158
-        static::deleting(function ($model) {
158
+        static::deleting(function($model) {
159 159
             $model->roles()->detach();
160 160
 
161 161
             $model->permissions()->detach();
Please login to merge, or discard this patch.
src/Auth/Database/Menu.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
     {
79 79
         static::treeBoot();
80 80
 
81
-        static::deleting(function ($model) {
81
+        static::deleting(function($model) {
82 82
             $model->roles()->detach();
83 83
         });
84 84
     }
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' || $query['method'] == 'orderByDesc';
450 450
         });
451 451
     }
Please login to merge, or discard this patch.