Completed
Pull Request — master (#3364)
by
unknown
02:21
created
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.
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/Form/Field.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
     /**
248 248
      * Field constructor.
249 249
      *
250
-     * @param       $column
250
+     * @param       string $column
251 251
      * @param array $arguments
252 252
      */
253 253
     public function __construct($column, $arguments = [])
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
     }
538 538
 
539 539
     /**
540
-     * @param string|array|Closure $input
540
+     * @param callable|null $input
541 541
      * @param string|array         $original
542 542
      *
543 543
      * @return array|Closure
@@ -736,7 +736,7 @@  discard block
 block discarded – undo
736 736
     /**
737 737
      * Set or get value of the field.
738 738
      *
739
-     * @param null $value
739
+     * @param string $value
740 740
      *
741 741
      * @return mixed
742 742
      */
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
     /**
908 908
      * Add html attributes to elements.
909 909
      *
910
-     * @param array|string $attribute
910
+     * @param string $attribute
911 911
      * @param mixed        $value
912 912
      *
913 913
      * @return $this
@@ -1244,7 +1244,7 @@  discard block
 block discarded – undo
1244 1244
     }
1245 1245
 
1246 1246
     /**
1247
-     * @param array $labelClass
1247
+     * @param string[] $labelClass
1248 1248
      *
1249 1249
      * @return self
1250 1250
      */
@@ -1299,7 +1299,7 @@  discard block
 block discarded – undo
1299 1299
      *
1300 1300
      * @param string $view
1301 1301
      *
1302
-     * @return string
1302
+     * @return Field
1303 1303
      */
1304 1304
     public function setView($view)
1305 1305
     {
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/MenuController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,10 +26,10 @@  discard block
 block discarded – undo
26 26
         return $content
27 27
             ->title(trans('admin.menu'))
28 28
             ->description(trans('admin.list'))
29
-            ->row(function (Row $row) {
29
+            ->row(function(Row $row) {
30 30
                 $row->column(6, $this->treeView()->render());
31 31
 
32
-                $row->column(6, function (Column $column) {
32
+                $row->column(6, function(Column $column) {
33 33
                     $form = new \Encore\Admin\Widgets\Form();
34 34
                     $form->action(admin_base_path('auth/menu'));
35 35
 
@@ -71,10 +71,10 @@  discard block
 block discarded – undo
71 71
     {
72 72
         $menuModel = config('admin.database.menu_model');
73 73
 
74
-        return $menuModel::tree(function (Tree $tree) {
74
+        return $menuModel::tree(function(Tree $tree) {
75 75
             $tree->disableCreate();
76 76
 
77
-            $tree->branch(function ($branch) {
77
+            $tree->branch(function($branch) {
78 78
                 $payload = "<i class='fa {$branch['icon']}'></i>&nbsp;<strong>{$branch['title']}</strong>";
79 79
 
80 80
                 if (!isset($branch['children'])) {
Please login to merge, or discard this patch.