Completed
Pull Request — master (#4723)
by Muhlis
02:30
created
src/Form.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
      *
437 437
      * @param array $data
438 438
      *
439
-     * @return mixed
439
+     * @return Response|null
440 440
      */
441 441
     protected function prepare($data = [])
442 442
     {
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
     /**
577 577
      * Get RedirectResponse after update.
578 578
      *
579
-     * @param mixed $key
579
+     * @param integer $key
580 580
      *
581 581
      * @return \Illuminate\Http\RedirectResponse
582 582
      */
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
                 return $ret;
252 252
             }
253 253
 
254
-            collect(explode(',', $id))->filter()->each(function ($id) {
254
+            collect(explode(',', $id))->filter()->each(function($id) {
255 255
                 $builder = $this->model()->newQuery();
256 256
 
257 257
                 if ($this->isSoftDeletes) {
@@ -304,9 +304,9 @@  discard block
 block discarded – undo
304 304
 
305 305
         $data = $model->toArray();
306 306
 
307
-        $this->fields()->filter(function ($field) {
307
+        $this->fields()->filter(function($field) {
308 308
             return $field instanceof Field\File;
309
-        })->each(function (Field\File $file) use ($data) {
309
+        })->each(function(Field\File $file) use ($data) {
310 310
             $file->setOriginal($data);
311 311
 
312 312
             $file->destroy();
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
             return $response;
332 332
         }
333 333
 
334
-        DB::transaction(function () {
334
+        DB::transaction(function() {
335 335
             $inserts = $this->prepareInsert($this->updates);
336 336
 
337 337
             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) {
@@ -985,7 +985,7 @@  discard block
 block discarded – undo
985 985
     protected function getFieldByColumn($column)
986 986
     {
987 987
         return $this->fields()->first(
988
-            function (Field $field) use ($column) {
988
+            function(Field $field) use ($column) {
989 989
                 if (is_array($field->column())) {
990 990
                     return in_array($column, $field->column());
991 991
                 }
@@ -1004,7 +1004,7 @@  discard block
 block discarded – undo
1004 1004
     {
1005 1005
         $values = $this->model->toArray();
1006 1006
 
1007
-        $this->fields()->each(function (Field $field) use ($values) {
1007
+        $this->fields()->each(function(Field $field) use ($values) {
1008 1008
             $field->setOriginal($values);
1009 1009
         });
1010 1010
     }
@@ -1032,7 +1032,7 @@  discard block
 block discarded – undo
1032 1032
 
1033 1033
         $data = $this->model->toArray();
1034 1034
 
1035
-        $this->fields()->each(function (Field $field) use ($data) {
1035
+        $this->fields()->each(function(Field $field) use ($data) {
1036 1036
             if (!in_array($field->column(), $this->ignored, true)) {
1037 1037
                 $field->fill($data);
1038 1038
             }
@@ -1162,7 +1162,7 @@  discard block
 block discarded – undo
1162 1162
      */
1163 1163
     public function setWidth($fieldWidth = 8, $labelWidth = 2): self
1164 1164
     {
1165
-        $this->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
1165
+        $this->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
1166 1166
             /* @var Field $field  */
1167 1167
             $field->setWidth($fieldWidth, $labelWidth);
1168 1168
         });
Please login to merge, or discard this patch.
src/Console/MinifyCommand.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
     protected function minifyCSS()
79 79
     {
80 80
         $css = collect(array_merge(Admin::$css, Admin::baseCss()))
81
-            ->unique()->map(function ($css) {
81
+            ->unique()->map(function($css) {
82 82
 
83 83
                 if (url()->isValidUrl($css)) {
84 84
                     $this->assets['css'][] = $css;
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
     protected function minifyJS()
103 103
     {
104 104
         $js = collect(array_merge(Admin::$js, Admin::baseJs()))
105
-            ->unique()->map(function ($js) {
105
+            ->unique()->map(function($js) {
106 106
 
107 107
                 if (url()->isValidUrl($js)) {
108 108
                     $this->assets['js'][] = $js;
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 
126 126
     protected function generateManifest()
127 127
     {
128
-        $min = collect(Admin::$min)->mapWithKeys(function ($path, $type) {
128
+        $min = collect(Admin::$min)->mapWithKeys(function($path, $type) {
129 129
             return [$type => sprintf('%s?id=%s', $path, md5(uniqid()))];
130 130
         });
131 131
 
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)->unique();
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)->unique();
@@ -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.
src/Grid/Concerns/HasElementNames.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -107,6 +107,7 @@
 block discarded – undo
107 107
     }
108 108
 
109 109
     /**
110
+     * @param string $name
110 111
      * @return string
111 112
      */
112 113
     protected function elementNameWithPrefix($name)
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
@@ -287,10 +287,10 @@
 block discarded – undo
287 287
             'middleware' => config('admin.route.middleware'),
288 288
         ];
289 289
 
290
-        app('router')->group($attributes, function ($router) {
290
+        app('router')->group($attributes, function($router) {
291 291
 
292 292
             /* @var \Illuminate\Support\Facades\Route $router */
293
-            $router->namespace('\Encore\Admin\Controllers')->group(function ($router) {
293
+            $router->namespace('\Encore\Admin\Controllers')->group(function($router) {
294 294
 
295 295
                 /* @var \Illuminate\Routing\Router $router */
296 296
                 $router->resource('auth/users', 'UserController')->names('admin.auth.users');
Please login to merge, or discard this patch.
src/Controllers/RoleController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -36,14 +36,14 @@  discard block
 block discarded – undo
36 36
         $grid->column('created_at', trans('admin.created_at'));
37 37
         $grid->column('updated_at', trans('admin.updated_at'));
38 38
 
39
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
39
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
40 40
             if ($actions->row->slug == 'administrator') {
41 41
                 $actions->disableDelete();
42 42
             }
43 43
         });
44 44
 
45
-        $grid->tools(function (Grid\Tools $tools) {
46
-            $tools->batch(function (Grid\Tools\BatchActions $actions) {
45
+        $grid->tools(function(Grid\Tools $tools) {
46
+            $tools->batch(function(Grid\Tools\BatchActions $actions) {
47 47
                 $actions->disableDelete();
48 48
             });
49 49
         });
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         $show->field('id', 'ID');
68 68
         $show->field('slug', trans('admin.slug'));
69 69
         $show->field('name', trans('admin.name'));
70
-        $show->field('permissions', trans('admin.permissions'))->as(function ($permission) {
70
+        $show->field('permissions', trans('admin.permissions'))->as(function($permission) {
71 71
             return $permission->pluck('name');
72 72
         })->label();
73 73
         $show->field('created_at', trans('admin.created_at'));
Please login to merge, or discard this patch.
src/Controllers/LogController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,14 +27,14 @@  discard block
 block discarded – undo
27 27
 
28 28
         $grid->column('id', 'ID')->sortable();
29 29
         $grid->column('user.name', 'User');
30
-        $grid->column('method')->display(function ($method) {
30
+        $grid->column('method')->display(function($method) {
31 31
             $color = Arr::get(OperationLog::$methodColors, $method, 'grey');
32 32
 
33 33
             return "<span class=\"badge bg-$color\">$method</span>";
34 34
         });
35 35
         $grid->column('path')->label('info');
36 36
         $grid->column('ip')->label('primary');
37
-        $grid->column('input')->display(function ($input) {
37
+        $grid->column('input')->display(function($input) {
38 38
             $input = json_decode($input, true);
39 39
             $input = Arr::except($input, ['_pjax', '_token', '_method', '_previous_']);
40 40
             if (empty($input)) {
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 
47 47
         $grid->column('created_at', trans('admin.created_at'));
48 48
 
49
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
49
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
50 50
             $actions->disableEdit();
51 51
             $actions->disableView();
52 52
         });
53 53
 
54 54
         $grid->disableCreateButton();
55 55
 
56
-        $grid->filter(function (Grid\Filter $filter) {
56
+        $grid->filter(function(Grid\Filter $filter) {
57 57
             $userModel = config('admin.database.users_model');
58 58
 
59 59
             $filter->equal('user_id', 'User')->select($userModel::all()->pluck('name', 'id'));
Please login to merge, or discard this patch.
src/Controllers/UserController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
         $grid->column('created_at', trans('admin.created_at'));
35 35
         $grid->column('updated_at', trans('admin.updated_at'));
36 36
 
37
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
37
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
38 38
             if ($actions->getKey() == 1) {
39 39
                 $actions->disableDelete();
40 40
             }
41 41
         });
42 42
 
43
-        $grid->tools(function (Grid\Tools $tools) {
44
-            $tools->batch(function (Grid\Tools\BatchActions $actions) {
43
+        $grid->tools(function(Grid\Tools $tools) {
44
+            $tools->batch(function(Grid\Tools\BatchActions $actions) {
45 45
                 $actions->disableDelete();
46 46
             });
47 47
         });
@@ -65,10 +65,10 @@  discard block
 block discarded – undo
65 65
         $show->field('id', 'ID');
66 66
         $show->field('username', trans('admin.username'));
67 67
         $show->field('name', trans('admin.name'));
68
-        $show->field('roles', trans('admin.roles'))->as(function ($roles) {
68
+        $show->field('roles', trans('admin.roles'))->as(function($roles) {
69 69
             return $roles->pluck('name');
70 70
         })->label();
71
-        $show->field('permissions', trans('admin.permissions'))->as(function ($permission) {
71
+        $show->field('permissions', trans('admin.permissions'))->as(function($permission) {
72 72
             return $permission->pluck('name');
73 73
         })->label();
74 74
         $show->field('created_at', trans('admin.created_at'));
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
         $form->image('avatar', trans('admin.avatar'));
102 102
         $form->password('password', trans('admin.password'))->rules('required|confirmed');
103 103
         $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
104
-            ->default(function ($form) {
104
+            ->default(function($form) {
105 105
                 return $form->model()->password;
106 106
             });
107 107
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         $form->display('created_at', trans('admin.created_at'));
114 114
         $form->display('updated_at', trans('admin.updated_at'));
115 115
 
116
-        $form->saving(function (Form $form) {
116
+        $form->saving(function(Form $form) {
117 117
             if ($form->password && $form->model()->password != $form->password) {
118 118
                 $form->password = bcrypt($form->password);
119 119
             }
Please login to merge, or discard this patch.
src/Form/Field/Timezone.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 
11 11
     public function render()
12 12
     {
13
-        $this->options = collect(DateTimeZone::listIdentifiers(DateTimeZone::ALL))->mapWithKeys(function ($timezone) {
13
+        $this->options = collect(DateTimeZone::listIdentifiers(DateTimeZone::ALL))->mapWithKeys(function($timezone) {
14 14
             return [$timezone => $timezone];
15 15
         })->toArray();
16 16
 
Please login to merge, or discard this patch.