Fixed entity management

Author: mikebronner

src/Http/Controllers/RolesController.php

@@ -44,20 +44,17 @@ public function edit($name) : View
     {
         $role = (new Role)->with('permissions')->find($name);
         $this->authorize('edit', $role);
-        $actions = (new Action)->all();
-        $entities = collect(array_keys(app('Illuminate\Contracts\Auth\Access\Gate')->policies()))
-            ->map(function ($entity) {
-                return strtolower(collect(explode('\\', $entity))->last());
-            })
-            ->filter(function ($entity) {
-                return ! in_array($entity, ['permission', 'entity']);
-            })
-            ->map(function ($entity) {
+        collect(array_keys(app('Illuminate\Contracts\Auth\Access\Gate')->policies()))
+            ->each(function ($entity) {
+                $entity = strtolower(collect(explode('\\', $entity))->last());
+
                 return (new Entity)
                     ->firstOrCreate([
                         'name' => $entity,
                     ]);
             });
+        $entities = (new Entity)->whereNotIn('name', ['permission', 'entity'])->get();
+        $actions = (new Action)->all();
         $ownerships = (new Ownership)->all();
         $permissionMatrix = [];