fix spatie permission cache issue

Author: ctf0

src/Controllers/Admin/PagesController.php

@@ -5,6 +5,7 @@
 use Illuminate\Http\Request;
 use ctf0\SimpleMenu\Models\Page;
 use Spatie\Permission\Models\Role;
+use Spatie\Permission\Models\Permission;
 use ctf0\SimpleMenu\Controllers\BaseController;
 use ctf0\SimpleMenu\Controllers\Admin\Traits\PageOps;
 
@@ -32,7 +33,7 @@ public function index()
     public function create()
     {
         $roles       = Role::get()->pluck('name', 'name');
-        $permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
+        $permissions = Permission::get()->pluck('name', 'name');
         $menus       = $this->cache->tags('sm')->get('menus')->pluck('name', 'id');
 
         return view("{$this->adminPath}.pages.create", compact('roles', 'permissions', 'menus'));
@@ -71,7 +72,7 @@ public function store(Request $request)
     public function edit($id)
     {
         $roles       = Role::get()->pluck('name', 'name');
-        $permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
+        $permissions = Permission::get()->pluck('name', 'name');
         $page        = $this->cache->tags('sm')->get('pages')->find($id);
         $menus       = $this->cache->tags('sm')->get('menus')->pluck('name', 'id');
 

src/Controllers/Admin/PermissionsController.php

@@ -18,7 +18,7 @@ class PermissionsController extends BaseController
      */
     public function index()
     {
-        $permissions = $this->cache->get('spatie.permission.cache');
+        $permissions = Permission::get();
 
         return view("{$this->adminPath}.permissions.index", compact('permissions'));
     }
@@ -60,7 +60,7 @@ public function store(Request $request)
      */
     public function edit($id)
     {
-        $permission = $this->cache->get('spatie.permission.cache')->find($id);
+        $permission = Permission::find($id);
 
         return view("{$this->adminPath}.permissions.edit", compact('permission'));
     }

src/Controllers/Admin/RolesController.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Http\Request;
 use Spatie\Permission\Models\Role;
+use Spatie\Permission\Models\Permission;
 use ctf0\SimpleMenu\Controllers\BaseController;
 use ctf0\SimpleMenu\Controllers\Admin\Traits\RolePermOps;
 
@@ -30,7 +31,7 @@ public function index()
      */
     public function create()
     {
-        $permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
+        $permissions = Permission::get()->pluck('name', 'name');
 
         return view("{$this->adminPath}.roles.create", compact('permissions'));
     }
@@ -66,7 +67,7 @@ public function store(Request $request)
     public function edit($id)
     {
         $role        = Role::find($id);
-        $permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
+        $permissions = Permission::get()->pluck('name', 'name');
 
         return view("{$this->adminPath}.roles.edit", compact('role', 'permissions'));
     }

src/Controllers/Admin/UsersController.php

@@ -5,6 +5,7 @@
 use App\User;
 use Illuminate\Http\Request;
 use Spatie\Permission\Models\Role;
+use Spatie\Permission\Models\Permission;
 use ctf0\SimpleMenu\Controllers\BaseController;
 
 class UsersController extends BaseController
@@ -29,7 +30,7 @@ public function index()
     public function create()
     {
         $roles       = Role::get()->pluck('name', 'name');
-        $permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
+        $permissions = Permission::get()->pluck('name', 'name');
 
         return view("{$this->adminPath}.users.create", compact('roles', 'permissions'));
     }
@@ -70,7 +71,7 @@ public function edit($id)
     {
         $user        = $this->cache->get('sm-users')->find($id);
         $roles       = Role::get()->pluck('name', 'name');
-        $permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
+        $permissions = Permission::get()->pluck('name', 'name');
 
         return view("{$this->adminPath}.users.edit", compact('user', 'roles', 'permissions'));
     }

src/SimpleMenuServiceProvider.php

@@ -5,6 +5,7 @@
 use ctf0\SimpleMenu\Models\Menu;
 use ctf0\SimpleMenu\Models\Page;
 use Illuminate\Support\Facades\URL;
+use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\ServiceProvider;
 use ctf0\SimpleMenu\Observers\MenuObserver;
 use ctf0\SimpleMenu\Observers\PageObserver;
@@ -24,9 +25,9 @@ class SimpleMenuServiceProvider extends ServiceProvider
     /**
      * Perform post-registration booting of services.
      */
-    public function boot()
+    public function boot(Filesystem $file)
     {
-        $this->file = app('files');
+        $this->file = $file;
 
         $this->packagePublish();
 
@@ -215,7 +216,7 @@ protected function autoReg()
         }
 
         // run check once
-        app('cache')->store('file')->rememberForever('ct-mm', function () {
+        app('cache')->store('file')->rememberForever('ct-sm', function () {
             return 'added';
         });
     }