Completed
Pull Request — master (#3215)
by Hiroyuki
02:22
created
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') && config('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/Grid/Tools.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
      */
86 86
     public function disableFilterButton(bool $disable = true)
87 87
     {
88
-        $this->tools = $this->tools->map(function ($tool) use ($disable) {
88
+        $this->tools = $this->tools->map(function($tool) use ($disable) {
89 89
             if ($tool instanceof FilterButton) {
90 90
                 return $tool->disable($disable);
91 91
             }
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
      */
102 102
     public function disableRefreshButton(bool $disable = true)
103 103
     {
104
-        $this->tools = $this->tools->map(function (AbstractTool $tool) use ($disable) {
104
+        $this->tools = $this->tools->map(function(AbstractTool $tool) use ($disable) {
105 105
             if ($tool instanceof RefreshButton) {
106 106
                 return $tool->disable($disable);
107 107
             }
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
      */
118 118
     public function disableBatchActions(bool $disable = true)
119 119
     {
120
-        $this->tools = $this->tools->map(function ($tool) use ($disable) {
120
+        $this->tools = $this->tools->map(function($tool) use ($disable) {
121 121
             if ($tool instanceof BatchActions) {
122 122
                 return $tool->disable($disable);
123 123
             }
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
      */
132 132
     public function batch(\Closure $closure)
133 133
     {
134
-        call_user_func($closure, $this->tools->first(function ($tool) {
134
+        call_user_func($closure, $this->tools->first(function($tool) {
135 135
             return $tool instanceof BatchActions;
136 136
         }));
137 137
     }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
      */
144 144
     public function render()
145 145
     {
146
-        return $this->tools->map(function ($tool) {
146
+        return $this->tools->map(function($tool) {
147 147
             if ($tool instanceof AbstractTool) {
148 148
                 if (!$tool->allowed()) {
149 149
                     return '';
Please login to merge, or discard this patch.
src/Middleware/Permission.php 1 patch
Spacing   +3 added lines, -3 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;
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 
88 88
         return collect($excepts)
89 89
             ->map('admin_base_path')
90
-            ->contains(function ($except) use ($request) {
90
+            ->contains(function($except) use ($request) {
91 91
                 if ($except !== '/') {
92 92
                     $except = trim($except, '/');
93 93
                 }
Please login to merge, or discard this patch.
src/Middleware/Authenticate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
 
44 44
         return collect($excepts)
45 45
             ->map('admin_base_path')
46
-            ->contains(function ($except) use ($request) {
46
+            ->contains(function($except) use ($request) {
47 47
                 if ($except !== '/') {
48 48
                     $except = trim($except, '/');
49 49
                 }
Please login to merge, or discard this patch.
src/Form/NestedForm.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -209,7 +209,7 @@
 block discarded – undo
209 209
             $values = $this->original[$key];
210 210
         }
211 211
 
212
-        $this->fields->each(function (Field $field) use ($values) {
212
+        $this->fields->each(function(Field $field) use ($values) {
213 213
             $field->setOriginal($values);
214 214
         });
215 215
     }
Please login to merge, or discard this patch.
src/Show/Field.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
      */
180 180
     public function using(array $values, $default = null)
181 181
     {
182
-        return $this->as(function ($value) use ($values, $default) {
182
+        return $this->as(function($value) use ($values, $default) {
183 183
             if (is_null($value)) {
184 184
                 return $default;
185 185
             }
@@ -199,8 +199,8 @@  discard block
 block discarded – undo
199 199
      */
200 200
     public function image($server = '', $width = 200, $height = 200)
201 201
     {
202
-        return $this->unescape()->as(function ($images) use ($server, $width, $height) {
203
-            return collect($images)->map(function ($path) use ($server, $width, $height) {
202
+        return $this->unescape()->as(function($images) use ($server, $width, $height) {
203
+            return collect($images)->map(function($path) use ($server, $width, $height) {
204 204
                 if (empty($path)) {
205 205
                     return '';
206 206
                 }
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
     {
237 237
         $field = $this;
238 238
 
239
-        return $this->unescape()->as(function ($path) use ($server, $download, $field) {
239
+        return $this->unescape()->as(function($path) use ($server, $download, $field) {
240 240
             $name = basename($path);
241 241
 
242 242
             $field->border = false;
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
      */
289 289
     public function link($href = '', $target = '_blank')
290 290
     {
291
-        return $this->unescape()->as(function ($link) use ($href, $target) {
291
+        return $this->unescape()->as(function($link) use ($href, $target) {
292 292
             $href = $href ?: $link;
293 293
 
294 294
             return "<a href='$href' target='{$target}'>{$link}</a>";
@@ -304,12 +304,12 @@  discard block
 block discarded – undo
304 304
      */
305 305
     public function label($style = 'success')
306 306
     {
307
-        return $this->unescape()->as(function ($value) use ($style) {
307
+        return $this->unescape()->as(function($value) use ($style) {
308 308
             if ($value instanceof Arrayable) {
309 309
                 $value = $value->toArray();
310 310
             }
311 311
 
312
-            return collect((array) $value)->map(function ($name) use ($style) {
312
+            return collect((array) $value)->map(function($name) use ($style) {
313 313
                 return "<span class='label label-{$style}'>$name</span>";
314 314
             })->implode('&nbsp;');
315 315
         });
@@ -324,12 +324,12 @@  discard block
 block discarded – undo
324 324
      */
325 325
     public function badge($style = 'blue')
326 326
     {
327
-        return $this->unescape()->as(function ($value) use ($style) {
327
+        return $this->unescape()->as(function($value) use ($style) {
328 328
             if ($value instanceof Arrayable) {
329 329
                 $value = $value->toArray();
330 330
             }
331 331
 
332
-            return collect((array) $value)->map(function ($name) use ($style) {
332
+            return collect((array) $value)->map(function($name) use ($style) {
333 333
                 return "<span class='badge bg-{$style}'>$name</span>";
334 334
             })->implode('&nbsp;');
335 335
         });
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
     {
345 345
         $field = $this;
346 346
 
347
-        return $this->unescape()->as(function ($value) use ($field) {
347
+        return $this->unescape()->as(function($value) use ($field) {
348 348
             $content = json_decode($value, true);
349 349
 
350 350
             if (json_last_error() == 0) {
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
 
474 474
         $field = $this;
475 475
 
476
-        return $this->as(function ($value) use ($extend, $field, $arguments) {
476
+        return $this->as(function($value) use ($extend, $field, $arguments) {
477 477
             if (!$extend->border) {
478 478
                 $field->border = false;
479 479
             }
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
     public function render()
532 532
     {
533 533
         if ($this->showAs->isNotEmpty()) {
534
-            $this->showAs->each(function ($callable) {
534
+            $this->showAs->each(function($callable) {
535 535
                 $this->value = $callable->call(
536 536
                     $this->parent->getModel(),
537 537
                     $this->value
Please login to merge, or discard this patch.
database/migrations/2016_01_04_173148_create_admin_tables.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
      */
22 22
     public function up()
23 23
     {
24
-        Schema::create(config('admin.database.users_table'), function (Blueprint $table) {
24
+        Schema::create(config('admin.database.users_table'), function(Blueprint $table) {
25 25
             $table->increments('id');
26 26
             $table->string('username', 190)->unique();
27 27
             $table->string('password', 60);
@@ -31,14 +31,14 @@  discard block
 block discarded – undo
31 31
             $table->timestamps();
32 32
         });
33 33
 
34
-        Schema::create(config('admin.database.roles_table'), function (Blueprint $table) {
34
+        Schema::create(config('admin.database.roles_table'), function(Blueprint $table) {
35 35
             $table->increments('id');
36 36
             $table->string('name', 50)->unique();
37 37
             $table->string('slug', 50);
38 38
             $table->timestamps();
39 39
         });
40 40
 
41
-        Schema::create(config('admin.database.permissions_table'), function (Blueprint $table) {
41
+        Schema::create(config('admin.database.permissions_table'), function(Blueprint $table) {
42 42
             $table->increments('id');
43 43
             $table->string('name', 50)->unique();
44 44
             $table->string('slug', 50);
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
             $table->timestamps();
48 48
         });
49 49
 
50
-        Schema::create(config('admin.database.menu_table'), function (Blueprint $table) {
50
+        Schema::create(config('admin.database.menu_table'), function(Blueprint $table) {
51 51
             $table->increments('id');
52 52
             $table->integer('parent_id')->default(0);
53 53
             $table->integer('order')->default(0);
@@ -59,35 +59,35 @@  discard block
 block discarded – undo
59 59
             $table->timestamps();
60 60
         });
61 61
 
62
-        Schema::create(config('admin.database.role_users_table'), function (Blueprint $table) {
62
+        Schema::create(config('admin.database.role_users_table'), function(Blueprint $table) {
63 63
             $table->integer('role_id');
64 64
             $table->integer('user_id');
65 65
             $table->index(['role_id', 'user_id']);
66 66
             $table->timestamps();
67 67
         });
68 68
 
69
-        Schema::create(config('admin.database.role_permissions_table'), function (Blueprint $table) {
69
+        Schema::create(config('admin.database.role_permissions_table'), function(Blueprint $table) {
70 70
             $table->integer('role_id');
71 71
             $table->integer('permission_id');
72 72
             $table->index(['role_id', 'permission_id']);
73 73
             $table->timestamps();
74 74
         });
75 75
 
76
-        Schema::create(config('admin.database.user_permissions_table'), function (Blueprint $table) {
76
+        Schema::create(config('admin.database.user_permissions_table'), function(Blueprint $table) {
77 77
             $table->integer('user_id');
78 78
             $table->integer('permission_id');
79 79
             $table->index(['user_id', 'permission_id']);
80 80
             $table->timestamps();
81 81
         });
82 82
 
83
-        Schema::create(config('admin.database.role_menu_table'), function (Blueprint $table) {
83
+        Schema::create(config('admin.database.role_menu_table'), function(Blueprint $table) {
84 84
             $table->integer('role_id');
85 85
             $table->integer('menu_id');
86 86
             $table->index(['role_id', 'menu_id']);
87 87
             $table->timestamps();
88 88
         });
89 89
 
90
-        Schema::create(config('admin.database.operation_log_table'), function (Blueprint $table) {
90
+        Schema::create(config('admin.database.operation_log_table'), function(Blueprint $table) {
91 91
             $table->increments('id');
92 92
             $table->integer('user_id');
93 93
             $table->string('path');
Please login to merge, or discard this patch.