Completed
Pull Request — master (#4595)
by zi
02:42
created
src/Controllers/Dashboard.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -21,20 +21,20 @@
 block discarded – undo
21 21
     public static function environment()
22 22
     {
23 23
         $envs = [
24
-            ['name' => 'PHP version',       'value' => 'PHP/'.PHP_VERSION],
25
-            ['name' => 'Laravel version',   'value' => app()->version()],
26
-            ['name' => 'CGI',               'value' => php_sapi_name()],
27
-            ['name' => 'Uname',             'value' => php_uname()],
28
-            ['name' => 'Server',            'value' => Arr::get($_SERVER, 'SERVER_SOFTWARE')],
24
+            ['name' => 'PHP version', 'value' => 'PHP/'.PHP_VERSION],
25
+            ['name' => 'Laravel version', 'value' => app()->version()],
26
+            ['name' => 'CGI', 'value' => php_sapi_name()],
27
+            ['name' => 'Uname', 'value' => php_uname()],
28
+            ['name' => 'Server', 'value' => Arr::get($_SERVER, 'SERVER_SOFTWARE')],
29 29
 
30
-            ['name' => 'Cache driver',      'value' => config('cache.default')],
31
-            ['name' => 'Session driver',    'value' => config('session.driver')],
32
-            ['name' => 'Queue driver',      'value' => config('queue.default')],
30
+            ['name' => 'Cache driver', 'value' => config('cache.default')],
31
+            ['name' => 'Session driver', 'value' => config('session.driver')],
32
+            ['name' => 'Queue driver', 'value' => config('queue.default')],
33 33
 
34
-            ['name' => 'Timezone',          'value' => config('app.timezone')],
35
-            ['name' => 'Locale',            'value' => config('app.locale')],
36
-            ['name' => 'Env',               'value' => config('app.env')],
37
-            ['name' => 'URL',               'value' => config('app.url')],
34
+            ['name' => 'Timezone', 'value' => config('app.timezone')],
35
+            ['name' => 'Locale', 'value' => config('app.locale')],
36
+            ['name' => 'Env', 'value' => config('app.env')],
37
+            ['name' => 'URL', 'value' => config('app.url')],
38 38
         ];
39 39
 
40 40
         return view('admin::dashboard.environment', compact('envs'));
Please login to merge, or discard this patch.
src/Form/Field/Table.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,9 +65,9 @@
 block discarded – undo
65 65
 
66 66
         $prepare = $form->prepare($input);
67 67
 
68
-        return collect($prepare)->reject(function ($item) {
68
+        return collect($prepare)->reject(function($item) {
69 69
             return $item[NestedForm::REMOVE_FLAG_NAME] == 1;
70
-        })->map(function ($item) {
70
+        })->map(function($item) {
71 71
             unset($item[NestedForm::REMOVE_FLAG_NAME]);
72 72
 
73 73
             return $item;
Please login to merge, or discard this patch.
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
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
                 return $ret;
378 378
             }
379 379
 
380
-            collect(explode(',', $id))->filter()->each(function ($id) {
380
+            collect(explode(',', $id))->filter()->each(function($id) {
381 381
                 $builder = $this->model()->newQuery();
382 382
 
383 383
                 if ($this->isSoftDeletes) {
@@ -430,9 +430,9 @@  discard block
 block discarded – undo
430 430
 
431 431
         $data = $model->toArray();
432 432
 
433
-        $this->builder->fields()->filter(function ($field) {
433
+        $this->builder->fields()->filter(function($field) {
434 434
             return $field instanceof Field\File;
435
-        })->each(function (Field\File $file) use ($data) {
435
+        })->each(function(Field\File $file) use ($data) {
436 436
             $file->setOriginal($data);
437 437
 
438 438
             $file->destroy();
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
             return $response;
458 458
         }
459 459
 
460
-        DB::transaction(function () {
460
+        DB::transaction(function() {
461 461
             $inserts = $this->prepareInsert($this->updates);
462 462
 
463 463
             foreach ($inserts as $column => $value) {
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
             return $response;
626 626
         }
627 627
 
628
-        DB::transaction(function () {
628
+        DB::transaction(function() {
629 629
             $updates = $this->prepareUpdate($this->updates);
630 630
 
631 631
             foreach ($updates as $column => $value) {
@@ -1105,7 +1105,7 @@  discard block
 block discarded – undo
1105 1105
     protected function getFieldByColumn($column)
1106 1106
     {
1107 1107
         return $this->builder->fields()->first(
1108
-            function (Field $field) use ($column) {
1108
+            function(Field $field) use ($column) {
1109 1109
                 if (is_array($field->column())) {
1110 1110
                     return in_array($column, $field->column());
1111 1111
                 }
@@ -1124,7 +1124,7 @@  discard block
 block discarded – undo
1124 1124
     {
1125 1125
         $values = $this->model->toArray();
1126 1126
 
1127
-        $this->builder->fields()->each(function (Field $field) use ($values) {
1127
+        $this->builder->fields()->each(function(Field $field) use ($values) {
1128 1128
             $field->setOriginal($values);
1129 1129
         });
1130 1130
     }
@@ -1152,7 +1152,7 @@  discard block
 block discarded – undo
1152 1152
 
1153 1153
         $data = $this->model->toArray();
1154 1154
 
1155
-        $this->builder->fields()->each(function (Field $field) use ($data) {
1155
+        $this->builder->fields()->each(function(Field $field) use ($data) {
1156 1156
             if (!in_array($field->column(), $this->ignored, true)) {
1157 1157
                 $field->fill($data);
1158 1158
             }
@@ -1282,7 +1282,7 @@  discard block
 block discarded – undo
1282 1282
      */
1283 1283
     public function setWidth($fieldWidth = 8, $labelWidth = 2): self
1284 1284
     {
1285
-        $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
1285
+        $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
1286 1286
             /* @var Field $field  */
1287 1287
             $field->setWidth($fieldWidth, $labelWidth);
1288 1288
         });
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.