Completed
Push — master ( fcb695...c2a60e )
by Song
08:26
created
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_base_path('auth/menu'));
37 37
 
@@ -66,10 +66,10 @@  discard block
 block discarded – undo
66 66
      */
67 67
     protected function treeView()
68 68
     {
69
-        return Menu::tree(function (Tree $tree) {
69
+        return Menu::tree(function(Tree $tree) {
70 70
             $tree->disableCreate();
71 71
 
72
-            $tree->branch(function ($branch) {
72
+            $tree->branch(function($branch) {
73 73
                 $payload = "<i class='fa {$branch['icon']}'></i>&nbsp;<strong>{$branch['title']}</strong>";
74 74
 
75 75
                 if (!isset($branch['children'])) {
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
      */
93 93
     public function edit($id)
94 94
     {
95
-        return Admin::content(function (Content $content) use ($id) {
95
+        return Admin::content(function(Content $content) use ($id) {
96 96
             $content->header(trans('admin.menu'));
97 97
             $content->description(trans('admin.edit'));
98 98
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
      */
108 108
     public function form()
109 109
     {
110
-        return Menu::form(function (Form $form) {
110
+        return Menu::form(function(Form $form) {
111 111
             $form->display('id', 'ID');
112 112
 
113 113
             $form->select('parent_id', trans('admin.parent_id'))->options(Menu::selectOptions());
Please login to merge, or discard this patch.
src/Controllers/UserController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
      */
23 23
     public function index()
24 24
     {
25
-        return Admin::content(function (Content $content) {
25
+        return Admin::content(function(Content $content) {
26 26
             $content->header(trans('admin.administrator'));
27 27
             $content->description(trans('admin.list'));
28 28
             $content->body($this->grid()->render());
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
      */
39 39
     public function edit($id)
40 40
     {
41
-        return Admin::content(function (Content $content) use ($id) {
41
+        return Admin::content(function(Content $content) use ($id) {
42 42
             $content->header(trans('admin.administrator'));
43 43
             $content->description(trans('admin.edit'));
44 44
             $content->body($this->form()->edit($id));
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
      */
53 53
     public function create()
54 54
     {
55
-        return Admin::content(function (Content $content) {
55
+        return Admin::content(function(Content $content) {
56 56
             $content->header(trans('admin.administrator'));
57 57
             $content->description(trans('admin.create'));
58 58
             $content->body($this->form());
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
      */
67 67
     protected function grid()
68 68
     {
69
-        return Administrator::grid(function (Grid $grid) {
69
+        return Administrator::grid(function(Grid $grid) {
70 70
             $grid->id('ID')->sortable();
71 71
             $grid->username(trans('admin.username'));
72 72
             $grid->name(trans('admin.name'));
@@ -74,14 +74,14 @@  discard block
 block discarded – undo
74 74
             $grid->created_at(trans('admin.created_at'));
75 75
             $grid->updated_at(trans('admin.updated_at'));
76 76
 
77
-            $grid->actions(function (Grid\Displayers\Actions $actions) {
77
+            $grid->actions(function(Grid\Displayers\Actions $actions) {
78 78
                 if ($actions->getKey() == 1) {
79 79
                     $actions->disableDelete();
80 80
                 }
81 81
             });
82 82
 
83
-            $grid->tools(function (Grid\Tools $tools) {
84
-                $tools->batch(function (Grid\Tools\BatchActions $actions) {
83
+            $grid->tools(function(Grid\Tools $tools) {
84
+                $tools->batch(function(Grid\Tools\BatchActions $actions) {
85 85
                     $actions->disableDelete();
86 86
                 });
87 87
             });
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
      */
96 96
     public function form()
97 97
     {
98
-        return Administrator::form(function (Form $form) {
98
+        return Administrator::form(function(Form $form) {
99 99
             $form->display('id', 'ID');
100 100
 
101 101
             $form->text('username', trans('admin.username'))->rules('required');
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
             $form->image('avatar', trans('admin.avatar'));
104 104
             $form->password('password', trans('admin.password'))->rules('required|confirmed');
105 105
             $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
106
-                ->default(function ($form) {
106
+                ->default(function($form) {
107 107
                     return $form->model()->password;
108 108
                 });
109 109
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
             $form->display('created_at', trans('admin.created_at'));
116 116
             $form->display('updated_at', trans('admin.updated_at'));
117 117
 
118
-            $form->saving(function (Form $form) {
118
+            $form->saving(function(Form $form) {
119 119
                 if ($form->password && $form->model()->password != $form->password) {
120 120
                     $form->password = bcrypt($form->password);
121 121
                 }
Please login to merge, or discard this patch.
src/Extension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
     protected static function routes($callback)
26 26
     {
27 27
         /* @var \Illuminate\Routing\Router $router */
28
-        Route::group(['prefix' => config('admin.route.prefix')], function ($router) use ($callback) {
28
+        Route::group(['prefix' => config('admin.route.prefix')], function($router) use ($callback) {
29 29
 
30 30
             $attributes = array_merge([
31 31
                 'middleware' => config('admin.route.middleware'),
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
@@ -235,10 +235,10 @@
 block discarded – undo
235 235
             'middleware'    => config('admin.route.middleware'),
236 236
         ];
237 237
 
238
-        Route::group($attributes, function ($router) {
238
+        Route::group($attributes, function($router) {
239 239
 
240 240
             /* @var \Illuminate\Routing\Router $router */
241
-            $router->group([], function ($router) {
241
+            $router->group([], function($router) {
242 242
 
243 243
                 /* @var \Illuminate\Routing\Router $router */
244 244
                 $router->resource('auth/users', 'UserController');
Please login to merge, or discard this patch.
src/AdminServiceProvider.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -59,11 +59,11 @@
 block discarded – undo
59 59
         }
60 60
 
61 61
         if ($this->app->runningInConsole()) {
62
-            $this->publishes([__DIR__.'/../config' => config_path()],                                   'laravel-admin-config');
63
-            $this->publishes([__DIR__.'/../resources/lang' => resource_path('lang')],                   'laravel-admin-lang');
62
+            $this->publishes([__DIR__.'/../config' => config_path()], 'laravel-admin-config');
63
+            $this->publishes([__DIR__.'/../resources/lang' => resource_path('lang')], 'laravel-admin-lang');
64 64
 //            $this->publishes([__DIR__.'/../resources/views' => resource_path('views/admin')],           'laravel-admin-views');
65
-            $this->publishes([__DIR__.'/../database/migrations' => database_path('migrations')],        'laravel-admin-migrations');
66
-            $this->publishes([__DIR__.'/../resources/assets' => public_path('vendor/laravel-admin')],   'laravel-admin-assets');
65
+            $this->publishes([__DIR__.'/../database/migrations' => database_path('migrations')], 'laravel-admin-migrations');
66
+            $this->publishes([__DIR__.'/../resources/assets' => public_path('vendor/laravel-admin')], 'laravel-admin-assets');
67 67
         }
68 68
     }
69 69
 
Please login to merge, or discard this patch.
src/Middleware/Permission.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
             return $next($request);
22 22
         }
23 23
 
24
-        if (!Admin::user()->allPermissions()->first(function ($permission) use ($request) {
24
+        if (!Admin::user()->allPermissions()->first(function($permission) use ($request) {
25 25
             return $permission->shouldPassThrough($request);
26 26
         })) {
27 27
             \Encore\Admin\Auth\Permission::error();
Please login to merge, or discard this patch.
src/Middleware/Pjax.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
      */
45 45
     public static function respond(\Symfony\Component\HttpFoundation\Response $response)
46 46
     {
47
-        $next = function () use ($response) {
47
+        $next = function() use ($response) {
48 48
             return $response;
49 49
         };
50 50
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
      */
137 137
     protected function decodeUtf8HtmlEntities($html)
138 138
     {
139
-        return preg_replace_callback('/(&#[0-9]+;)/', function ($html) {
139
+        return preg_replace_callback('/(&#[0-9]+;)/', function($html) {
140 140
             return mb_convert_encoding($html[1], 'UTF-8', 'HTML-ENTITIES');
141 141
         }, $html);
142 142
     }
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
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
     {
15 15
         $connection = config('admin.database.connection') ?: config('database.default');
16 16
 
17
-        Schema::connection($connection)->create(config('admin.database.users_table'), function (Blueprint $table) {
17
+        Schema::connection($connection)->create(config('admin.database.users_table'), function(Blueprint $table) {
18 18
             $table->increments('id');
19 19
             $table->string('username', 190)->unique();
20 20
             $table->string('password', 60);
@@ -23,21 +23,21 @@  discard block
 block discarded – undo
23 23
             $table->timestamps();
24 24
         });
25 25
 
26
-        Schema::connection($connection)->create(config('admin.database.roles_table'), function (Blueprint $table) {
26
+        Schema::connection($connection)->create(config('admin.database.roles_table'), function(Blueprint $table) {
27 27
             $table->increments('id');
28 28
             $table->string('name', 50)->unique();
29 29
             $table->string('slug', 50);
30 30
             $table->timestamps();
31 31
         });
32 32
 
33
-        Schema::connection($connection)->create(config('admin.database.permissions_table'), function (Blueprint $table) {
33
+        Schema::connection($connection)->create(config('admin.database.permissions_table'), function(Blueprint $table) {
34 34
             $table->increments('id');
35 35
             $table->string('name', 50)->unique();
36 36
             $table->string('slug', 50);
37 37
             $table->timestamps();
38 38
         });
39 39
 
40
-        Schema::connection($connection)->create(config('admin.database.menu_table'), function (Blueprint $table) {
40
+        Schema::connection($connection)->create(config('admin.database.menu_table'), function(Blueprint $table) {
41 41
             $table->increments('id');
42 42
             $table->integer('parent_id')->default(0);
43 43
             $table->integer('order')->default(0);
@@ -48,35 +48,35 @@  discard block
 block discarded – undo
48 48
             $table->timestamps();
49 49
         });
50 50
 
51
-        Schema::connection($connection)->create(config('admin.database.role_users_table'), function (Blueprint $table) {
51
+        Schema::connection($connection)->create(config('admin.database.role_users_table'), function(Blueprint $table) {
52 52
             $table->integer('role_id');
53 53
             $table->integer('user_id');
54 54
             $table->index(['role_id', 'user_id']);
55 55
             $table->timestamps();
56 56
         });
57 57
 
58
-        Schema::connection($connection)->create(config('admin.database.role_permissions_table'), function (Blueprint $table) {
58
+        Schema::connection($connection)->create(config('admin.database.role_permissions_table'), function(Blueprint $table) {
59 59
             $table->integer('role_id');
60 60
             $table->integer('permission_id');
61 61
             $table->index(['role_id', 'permission_id']);
62 62
             $table->timestamps();
63 63
         });
64 64
 
65
-        Schema::connection($connection)->create(config('admin.database.user_permissions_table'), function (Blueprint $table) {
65
+        Schema::connection($connection)->create(config('admin.database.user_permissions_table'), function(Blueprint $table) {
66 66
             $table->integer('user_id');
67 67
             $table->integer('permission_id');
68 68
             $table->index(['user_id', 'permission_id']);
69 69
             $table->timestamps();
70 70
         });
71 71
 
72
-        Schema::connection($connection)->create(config('admin.database.role_menu_table'), function (Blueprint $table) {
72
+        Schema::connection($connection)->create(config('admin.database.role_menu_table'), function(Blueprint $table) {
73 73
             $table->integer('role_id');
74 74
             $table->integer('menu_id');
75 75
             $table->index(['role_id', 'menu_id']);
76 76
             $table->timestamps();
77 77
         });
78 78
 
79
-        Schema::connection($connection)->create(config('admin.database.operation_log_table'), function (Blueprint $table) {
79
+        Schema::connection($connection)->create(config('admin.database.operation_log_table'), function(Blueprint $table) {
80 80
             $table->increments('id');
81 81
             $table->integer('user_id');
82 82
             $table->string('path');
Please login to merge, or discard this patch.
resources/views/partials/exception.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($errors->hasBag('exception'))
2
-    <?php $error = $errors->getBag('exception');?>
2
+    <?php $error = $errors->getBag('exception'); ?>
3 3
     <div class="alert alert-warning alert-dismissable">
4 4
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
5 5
         <h4>
Please login to merge, or discard this patch.