Completed
Pull Request — master (#3324)
by bobo
02:23
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/Controllers/LogController.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
 
37 37
         $grid->id('ID')->sortable();
38 38
         $grid->user()->name('User');
39
-        $grid->method()->display(function ($method) {
39
+        $grid->method()->display(function($method) {
40 40
             $color = Arr::get(OperationLog::$methodColors, $method, 'grey');
41 41
 
42 42
             return "<span class=\"badge bg-$color\">$method</span>";
43 43
         });
44 44
         $grid->path()->label('info');
45 45
         $grid->ip()->label('primary');
46
-        $grid->input()->display(function ($input) {
46
+        $grid->input()->display(function($input) {
47 47
             $input = json_decode($input, true);
48 48
             $input = Arr::except($input, ['_pjax', '_token', '_method', '_previous_']);
49 49
             if (empty($input)) {
@@ -55,14 +55,14 @@  discard block
 block discarded – undo
55 55
 
56 56
         $grid->created_at(trans('admin.created_at'));
57 57
 
58
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
58
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
59 59
             $actions->disableEdit();
60 60
             $actions->disableView();
61 61
         });
62 62
 
63 63
         $grid->disableCreation();
64 64
 
65
-        $grid->filter(function ($filter) {
65
+        $grid->filter(function($filter) {
66 66
             $userModel = config('admin.database.users_model');
67 67
 
68 68
             $filter->equal('user_id', 'User')->select($userModel::all()->pluck('name', 'id'));
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
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
                 return $ret;
306 306
             }
307 307
 
308
-            collect(explode(',', $id))->filter()->each(function ($id) {
308
+            collect(explode(',', $id))->filter()->each(function($id) {
309 309
                 $builder = $this->model()->newQuery();
310 310
 
311 311
                 if ($this->isSoftDeletes) {
@@ -359,9 +359,9 @@  discard block
 block discarded – undo
359 359
 
360 360
         $data = $model->toArray();
361 361
 
362
-        $this->builder->fields()->filter(function ($field) {
362
+        $this->builder->fields()->filter(function($field) {
363 363
             return $field instanceof Field\File;
364
-        })->each(function (Field\File $file) use ($data) {
364
+        })->each(function(Field\File $file) use ($data) {
365 365
             $file->setOriginal($data);
366 366
 
367 367
             $file->destroy();
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
             return $response;
387 387
         }
388 388
 
389
-        DB::transaction(function () {
389
+        DB::transaction(function() {
390 390
             $inserts = $this->prepareInsert($this->updates);
391 391
 
392 392
             foreach ($inserts as $column => $value) {
@@ -535,7 +535,7 @@  discard block
 block discarded – undo
535 535
             return $response;
536 536
         }
537 537
 
538
-        DB::transaction(function () {
538
+        DB::transaction(function() {
539 539
             $updates = $this->prepareUpdate($this->updates);
540 540
 
541 541
             foreach ($updates as $column => $value) {
@@ -1015,7 +1015,7 @@  discard block
 block discarded – undo
1015 1015
     protected function getFieldByColumn($column)
1016 1016
     {
1017 1017
         return $this->builder->fields()->first(
1018
-            function (Field $field) use ($column) {
1018
+            function(Field $field) use ($column) {
1019 1019
                 if (is_array($field->column())) {
1020 1020
                     return in_array($column, $field->column());
1021 1021
                 }
@@ -1036,7 +1036,7 @@  discard block
 block discarded – undo
1036 1036
 
1037 1037
         $values = $this->model->toArray();
1038 1038
 
1039
-        $this->builder->fields()->each(function (Field $field) use ($values) {
1039
+        $this->builder->fields()->each(function(Field $field) use ($values) {
1040 1040
             $field->setOriginal($values);
1041 1041
         });
1042 1042
     }
@@ -1066,7 +1066,7 @@  discard block
 block discarded – undo
1066 1066
 
1067 1067
         $data = $this->model->toArray();
1068 1068
 
1069
-        $this->builder->fields()->each(function (Field $field) use ($data) {
1069
+        $this->builder->fields()->each(function(Field $field) use ($data) {
1070 1070
             if (!in_array($field->column(), $this->ignored)) {
1071 1071
                 $field->fill($data);
1072 1072
             }
@@ -1189,7 +1189,7 @@  discard block
 block discarded – undo
1189 1189
      */
1190 1190
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
1191 1191
     {
1192
-        $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
1192
+        $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
1193 1193
             /* @var Field $field  */
1194 1194
             $field->setWidth($fieldWidth, $labelWidth);
1195 1195
         });
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/Grid/Concerns/HasFilter.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
      *
53 53
      * @param bool $toArray
54 54
      *
55
-     * @return array|Collection|mixed
55
+     * @return Collection
56 56
      */
57 57
     public function processFilter($toArray = true)
58 58
     {
Please login to merge, or discard this patch.
src/Grid/Tools/TotalRow.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
      */
62 62
     public function render()
63 63
     {
64
-        $columns = $this->getGrid()->columns()->flatMap(function (Column $column) {
64
+        $columns = $this->getGrid()->columns()->flatMap(function(Column $column) {
65 65
             $name = $column->getName();
66 66
 
67 67
             $total = '';
Please login to merge, or discard this patch.