Completed
Pull Request — master (#2254)
by
unknown
12:23 queued 09:50
created
resources/views/partials/success.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(Session::has('success'))
2
-    <?php $success = Session::get('success');?>
2
+    <?php $success = Session::get('success'); ?>
3 3
     <div class="alert alert-success alert-dismissable">
4 4
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
5 5
         <h4><i class="icon fa fa-check"></i>{{ array_get($success->get('title'), 0) }}</h4>
Please login to merge, or discard this patch.
src/Controllers/PermissionController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
      */
22 22
     public function index()
23 23
     {
24
-        return Admin::content(function (Content $content) {
24
+        return Admin::content(function(Content $content) {
25 25
             $content->header(trans('admin.permissions'));
26 26
             $content->description(trans('admin.list'));
27 27
             $content->body($this->grid()->render());
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
      */
38 38
     public function edit($id)
39 39
     {
40
-        return Admin::content(function (Content $content) use ($id) {
40
+        return Admin::content(function(Content $content) use ($id) {
41 41
             $content->header(trans('admin.permissions'));
42 42
             $content->description(trans('admin.edit'));
43 43
             $content->body($this->form()->edit($id));
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
      */
52 52
     public function create()
53 53
     {
54
-        return Admin::content(function (Content $content) {
54
+        return Admin::content(function(Content $content) {
55 55
             $content->header(trans('admin.permissions'));
56 56
             $content->description(trans('admin.create'));
57 57
             $content->body($this->form());
@@ -65,13 +65,13 @@  discard block
 block discarded – undo
65 65
      */
66 66
     protected function grid()
67 67
     {
68
-        return Admin::grid(Permission::class, function (Grid $grid) {
68
+        return Admin::grid(Permission::class, function(Grid $grid) {
69 69
             $grid->id('ID')->sortable();
70 70
             $grid->slug(trans('admin.slug'));
71 71
             $grid->name(trans('admin.name'));
72 72
 
73
-            $grid->http_path(trans('admin.route'))->display(function ($path) {
74
-                return collect(explode("\r\n", $path))->map(function ($path) {
73
+            $grid->http_path(trans('admin.route'))->display(function($path) {
74
+                return collect(explode("\r\n", $path))->map(function($path) {
75 75
                     $method = $this->http_method ?: ['ANY'];
76 76
 
77 77
                     if (Str::contains($path, ':')) {
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
                         $method = explode(',', $method);
80 80
                     }
81 81
 
82
-                    $method = collect($method)->map(function ($name) {
82
+                    $method = collect($method)->map(function($name) {
83 83
                         return strtoupper($name);
84
-                    })->map(function ($name) {
84
+                    })->map(function($name) {
85 85
                         return "<span class='label label-primary'>{$name}</span>";
86 86
                     })->implode('&nbsp;');
87 87
 
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
             $grid->created_at(trans('admin.created_at'));
95 95
             $grid->updated_at(trans('admin.updated_at'));
96 96
 
97
-            $grid->tools(function (Grid\Tools $tools) {
98
-                $tools->batch(function (Grid\Tools\BatchActions $actions) {
97
+            $grid->tools(function(Grid\Tools $tools) {
98
+                $tools->batch(function(Grid\Tools\BatchActions $actions) {
99 99
                     $actions->disableDelete();
100 100
                 });
101 101
             });
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
      */
110 110
     public function form()
111 111
     {
112
-        return Admin::form(Permission::class, function (Form $form) {
112
+        return Admin::form(Permission::class, function(Form $form) {
113 113
             $form->display('id', 'ID');
114 114
 
115 115
             $form->text('slug', trans('admin.slug'))->rules('required');
Please login to merge, or discard this patch.
src/Extension.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
     protected static function routes($callback)
25 25
     {
26 26
         /* @var \Illuminate\Routing\Router $router */
27
-        Route::group(['prefix' => config('admin.route.prefix')], function ($router) use ($callback) {
27
+        Route::group(['prefix' => config('admin.route.prefix')], function($router) use ($callback) {
28 28
             $attributes = array_merge([
29 29
                 'middleware' => config('admin.route.middleware'),
30 30
             ], static::config('route', []));
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -8,6 +8,9 @@
 block discarded – undo
8 8
 
9 9
 abstract class Extension
10 10
 {
11
+    /**
12
+     * @param string $key
13
+     */
11 14
     public static function config($key, $default = null)
12 15
     {
13 16
         $name = array_search(get_called_class(), Admin::$extensions);
Please login to merge, or discard this patch.
src/Grid/Column.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
         $grid = $this->grid;
410 410
         $column = $this;
411 411
 
412
-        $this->display(function ($value) use ($grid, $column, $class) {
412
+        $this->display(function($value) use ($grid, $column, $class) {
413 413
             $definition = new $class($value, $grid, $column, $this);
414 414
 
415 415
             return $definition->display();
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
     protected function htmlEntityEncode($item)
427 427
     {
428 428
         if (is_array($item)) {
429
-            array_walk_recursive($item, function (&$value) {
429
+            array_walk_recursive($item, function(&$value) {
430 430
                 $value = htmlentities($value);
431 431
             });
432 432
         } else {
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
506 506
      */
507 507
     protected function callSupportDisplayer($abstract, $arguments)
508 508
     {
509
-        return $this->display(function ($value) use ($abstract, $arguments) {
509
+        return $this->display(function($value) use ($abstract, $arguments) {
510 510
             if (is_array($value) || $value instanceof Arrayable) {
511 511
                 return call_user_func_array([collect($value), $abstract], $arguments);
512 512
             }
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
     protected function callBuiltinDisplayer($abstract, $arguments)
531 531
     {
532 532
         if ($abstract instanceof Closure) {
533
-            return $this->display(function ($value) use ($abstract, $arguments) {
533
+            return $this->display(function($value) use ($abstract, $arguments) {
534 534
                 return $abstract->call($this, ...array_merge([$value], $arguments));
535 535
             });
536 536
         }
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
             $grid = $this->grid;
540 540
             $column = $this;
541 541
 
542
-            return $this->display(function ($value) use ($abstract, $grid, $column, $arguments) {
542
+            return $this->display(function($value) use ($abstract, $grid, $column, $arguments) {
543 543
                 $displayer = new $abstract($value, $grid, $column, $this);
544 544
 
545 545
                 return call_user_func_array([$displayer, 'display'], $arguments);
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/Controllers/AuthController.php 2 patches
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      *
35 35
      * @param Request $request
36 36
      *
37
-     * @return mixed
37
+     * @return \Illuminate\Http\RedirectResponse
38 38
      */
39 39
     public function postLogin(Request $request)
40 40
     {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     /**
63 63
      * User logout.
64 64
      *
65
-     * @return Redirect
65
+     * @return \Illuminate\Http\RedirectResponse
66 66
      */
67 67
     public function getLogout(Request $request)
68 68
     {
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
     /**
77 77
      * User setting page.
78 78
      *
79
-     * @return mixed
79
+     * @return Content
80 80
      */
81 81
     public function getSetting()
82 82
     {
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
      *
168 168
      * @param \Illuminate\Http\Request $request
169 169
      *
170
-     * @return \Illuminate\Http\Response
170
+     * @return \Illuminate\Http\RedirectResponse
171 171
      */
172 172
     protected function sendLoginResponse(Request $request)
173 173
     {
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -80,11 +80,11 @@  discard block
 block discarded – undo
80 80
      */
81 81
     public function getSetting()
82 82
     {
83
-        return Admin::content(function (Content $content) {
83
+        return Admin::content(function(Content $content) {
84 84
             $content->header(trans('admin.user_setting'));
85 85
             $form = $this->settingForm();
86 86
             $form->tools(
87
-                function (Form\Tools $tools) {
87
+                function(Form\Tools $tools) {
88 88
                     $tools->disableBackButton();
89 89
                     $tools->disableListButton();
90 90
                 }
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
110 110
      */
111 111
     protected function settingForm()
112 112
     {
113
-        return Administrator::form(function (Form $form) {
113
+        return Administrator::form(function(Form $form) {
114 114
             $form->display('username', trans('admin.username'));
115 115
             $form->text('name', trans('admin.name'))->rules('required');
116 116
             $form->image('avatar', trans('admin.avatar'));
117 117
             $form->password('password', trans('admin.password'))->rules('confirmed|required');
118 118
             $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
119
-                ->default(function ($form) {
119
+                ->default(function($form) {
120 120
                     return $form->model()->password;
121 121
                 });
122 122
 
@@ -124,13 +124,13 @@  discard block
 block discarded – undo
124 124
 
125 125
             $form->ignore(['password_confirmation']);
126 126
 
127
-            $form->saving(function (Form $form) {
127
+            $form->saving(function(Form $form) {
128 128
                 if ($form->password && $form->model()->password != $form->password) {
129 129
                     $form->password = bcrypt($form->password);
130 130
                 }
131 131
             });
132 132
 
133
-            $form->saved(function () {
133
+            $form->saved(function() {
134 134
                 admin_toastr(trans('admin.update_succeeded'));
135 135
 
136 136
                 return redirect(admin_url('auth/setting'));
Please login to merge, or discard this patch.
src/Form.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -305,9 +305,9 @@  discard block
 block discarded – undo
305 305
         $data = $this->model->with($this->getRelations())
306 306
             ->findOrFail($id)->toArray();
307 307
 
308
-        $this->builder->fields()->filter(function ($field) {
308
+        $this->builder->fields()->filter(function($field) {
309 309
             return $field instanceof Field\File;
310
-        })->each(function (File $file) use ($data) {
310
+        })->each(function(File $file) use ($data) {
311 311
             $file->setOriginal($data);
312 312
 
313 313
             $file->destroy();
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
             return $response;
333 333
         }
334 334
 
335
-        DB::transaction(function () {
335
+        DB::transaction(function() {
336 336
             $inserts = $this->prepareInsert($this->updates);
337 337
 
338 338
             foreach ($inserts as $column => $value) {
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
             return $response;
534 534
         }
535 535
 
536
-        DB::transaction(function () {
536
+        DB::transaction(function() {
537 537
             $updates = $this->prepareUpdate($this->updates);
538 538
 
539 539
             foreach ($updates as $column => $value) {
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
     protected function getFieldByColumn($column)
926 926
     {
927 927
         return $this->builder->fields()->first(
928
-            function (Field $field) use ($column) {
928
+            function(Field $field) use ($column) {
929 929
                 if (is_array($field->column())) {
930 930
                     return in_array($column, $field->column());
931 931
                 }
@@ -946,7 +946,7 @@  discard block
 block discarded – undo
946 946
 
947 947
         $values = $this->model->toArray();
948 948
 
949
-        $this->builder->fields()->each(function (Field $field) use ($values) {
949
+        $this->builder->fields()->each(function(Field $field) use ($values) {
950 950
             $field->setOriginal($values);
951 951
         });
952 952
     }
@@ -968,7 +968,7 @@  discard block
 block discarded – undo
968 968
 
969 969
         $data = $this->model->toArray();
970 970
 
971
-        $this->builder->fields()->each(function (Field $field) use ($data) {
971
+        $this->builder->fields()->each(function(Field $field) use ($data) {
972 972
             if (!in_array($field->column(), $this->ignored)) {
973 973
                 $field->fill($data);
974 974
             }
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
      */
1090 1090
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
1091 1091
     {
1092
-        $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
1092
+        $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
1093 1093
             /* @var Field $field  */
1094 1094
             $field->setWidth($fieldWidth, $labelWidth);
1095 1095
         });
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
      *
279 279
      * @param $id
280 280
      *
281
-     * @return mixed
281
+     * @return boolean
282 282
      */
283 283
     public function destroy($id)
284 284
     {
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
      *
397 397
      * @param array $data
398 398
      *
399
-     * @return mixed
399
+     * @return Response|null
400 400
      */
401 401
     protected function prepare($data = [])
402 402
     {
@@ -867,7 +867,7 @@  discard block
 block discarded – undo
867 867
     /**
868 868
      * Set saved callback.
869 869
      *
870
-     * @param callable $callback
870
+     * @param Closure $callback
871 871
      *
872 872
      * @return void
873 873
      */
Please login to merge, or discard this patch.
src/Controllers/MenuController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -24,14 +24,14 @@  discard block
 block discarded – undo
24 24
      */
25 25
     public function index()
26 26
     {
27
-        return Admin::content(function (Content $content) {
27
+        return Admin::content(function(Content $content) {
28 28
             $content->header(trans('admin.menu'));
29 29
             $content->description(trans('admin.list'));
30 30
 
31
-            $content->row(function (Row $row) {
31
+            $content->row(function(Row $row) {
32 32
                 $row->column(6, $this->treeView()->render());
33 33
 
34
-                $row->column(6, function (Column $column) {
34
+                $row->column(6, function(Column $column) {
35 35
                     $form = new \Encore\Admin\Widgets\Form();
36 36
                     $form->action(admin_url('auth/menu'));
37 37
 
@@ -65,10 +65,10 @@  discard block
 block discarded – undo
65 65
      */
66 66
     protected function treeView()
67 67
     {
68
-        return Menu::tree(function (Tree $tree) {
68
+        return Menu::tree(function(Tree $tree) {
69 69
             $tree->disableCreate();
70 70
 
71
-            $tree->branch(function ($branch) {
71
+            $tree->branch(function($branch) {
72 72
                 $payload = "<i class='fa {$branch['icon']}'></i>&nbsp;<strong>{$branch['title']}</strong>";
73 73
 
74 74
                 if (!isset($branch['children'])) {
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
      */
96 96
     public function edit($id)
97 97
     {
98
-        return Admin::content(function (Content $content) use ($id) {
98
+        return Admin::content(function(Content $content) use ($id) {
99 99
             $content->header(trans('admin.menu'));
100 100
             $content->description(trans('admin.edit'));
101 101
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
      */
111 111
     public function form()
112 112
     {
113
-        return Menu::form(function (Form $form) {
113
+        return Menu::form(function(Form $form) {
114 114
             $form->display('id', 'ID');
115 115
 
116 116
             $form->select('parent_id', trans('admin.parent_id'))->options(Menu::selectOptions());
Please login to merge, or discard this patch.
src/Grid/Displayers/Actions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@
 block discarded – undo
120 120
      * Get url of current resource.
121 121
      * @return string
122 122
      */
123
-    public function getResourceURL(){
123
+    public function getResourceURL() {
124 124
         return url($this->getResource());
125 125
     }
126 126
 
Please login to merge, or discard this patch.