area17 / twill

src/AuthServiceProvider.php

Spacing +24 added lines, -24 removed lines

@@ -38,7 +38,7 @@ 
     {
         collect($ability)
             ->concat(static::ABILITY_ALIASES[$ability] ?? [])
-            ->each(function ($alias) use ($callback) {
+            ->each(function($alias) use ($callback) {
                 Gate::define($alias, $callback);
             });
     }
@@ -63,77 +63,77 @@ 
 
     public function boot()
     {
-        $this->define('list', function ($user, $item=null) {
-            return $this->authorize($user, function ($user) {
+        $this->define('list', function($user, $item = null) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::VIEWONLY, UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        $this->define('edit', function ($user, $item=null) {
-            return $this->authorize($user, function ($user) {
+        $this->define('edit', function($user, $item = null) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        $this->define('reorder', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('reorder', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        $this->define('publish', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('publish', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        $this->define('feature', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('feature', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        $this->define('delete', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('delete', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        $this->define('duplicate', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('duplicate', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        $this->define('upload', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('upload', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
             });
         });
 
-        $this->define('manage-users', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('manage-users', function($user) {
+            return $this->authorize($user, function($user) {
                 return $this->userHasRole($user, [UserRole::ADMIN]);
             });
         });
 
         // As an admin, I can edit users, except superadmins
         // As a non-admin, I can edit myself only
-        $this->define('edit-user', function ($user, $editedUser = null) {
-            return $this->authorize($user, function ($user) use ($editedUser) {
+        $this->define('edit-user', function($user, $editedUser = null) {
+            return $this->authorize($user, function($user) use ($editedUser) {
                 return ($this->userHasRole($user, [UserRole::ADMIN]) || $user->id == $editedUser->id)
                     && ($editedUser ? $editedUser->role !== self::SUPERADMIN : true);
             });
         });
 
-        $this->define('publish-user', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('publish-user', function($user) {
+            return $this->authorize($user, function($user) {
                 $editedUserObject = User::find(request('id'));
                 return $this->userHasRole($user, [UserRole::ADMIN]) && ($editedUserObject ? $user->id !== $editedUserObject->id && $editedUserObject->role !== self::SUPERADMIN : false);
             });
         });
 
-        $this->define('impersonate', function ($user) {
+        $this->define('impersonate', function($user) {
             return $user->role === self::SUPERADMIN;
         });
     }

src/Models/User.php

Spacing +4 added lines, -5 removed lines

@@ -233,11 +233,11 @@ 
 
     public function allPermissions()
     {
-        $permissions = Permission::whereHas('users', function ($query) {
+        $permissions = Permission::whereHas('users', function($query) {
             $query->where('id', $this->id);
-        })->orWhereHas('roles', function ($query) {
+        })->orWhereHas('roles', function($query) {
             $query->where('id', $this->role->id);
-        })->orWhereHas('groups', function ($query) {
+        })->orWhereHas('groups', function($query) {
             $query
                 ->join('group_twill_user', 'groups.id', '=', 'group_twill_user.group_id')
                 ->where('group_twill_user.twill_user_id', $this->id)
@@ -250,8 +250,7 @@ 
     public function getLastLoginColumnValueAttribute()
     {
         return $this->last_login_at ?
-            $this->last_login_at->format('d M Y, H:i') :
-            ($this->isActivated() ? '—' : twillTrans('twill::lang.user-management.activation-pending'));
+            $this->last_login_at->format('d M Y, H:i') : ($this->isActivated() ? '—' : twillTrans('twill::lang.user-management.activation-pending'));
     }
 
     public function setGoogle2faSecretAttribute($secret)

src/Http/Controllers/Admin/UserController.php

Spacing +3 added lines, -3 removed lines

@@ -348,7 +348,7 @@ 
     {
         if (config('twill.enabled.permissions-management')) {
             return Group::with('permissions')->get()
-                ->mapWithKeys(function ($group) {
+                ->mapWithKeys(function($group) {
                     return [$group->id => $group->permissions];
                 })->toArray();
         }
@@ -369,12 +369,12 @@ 
     private function getRoleList()
     {
         if (config('twill.enabled.permissions-management')) {
-            return Role::accessible()->published()->get()->map(function ($role) {
+            return Role::accessible()->published()->get()->map(function($role) {
                 return ['value' => $role->id, 'label' => $role->name];
             })->toArray();
         }
 
-        return collect(UserRole::toArray())->map(function ($item, $key) {
+        return collect(UserRole::toArray())->map(function($item, $key) {
             return ['value' => $key, 'label' => $item];
         })->values()->toArray();
     }

src/Repositories/Behaviors/HandlePermissions.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
         }
 
         $userItemPermissions = twillModel('user')::notSuperAdmin()->get()->mapWithKeys(
-            function ($user) use ($object, $moduleName) {
+            function($user) use ($object, $moduleName) {
                 $permissionName = $this->getUserItemPermissionName($user, $object, $moduleName);
 
                 return ["user_{$user->id}_permission" => $permissionName];
@@ -51,7 +51,7 @@ 
 
         // Group-Item permissions
         $userGroups = $user->groups()->where('is_everyone_group', false)->get();
-        foreach($userGroups as $group) {
+        foreach ($userGroups as $group) {
             if ($permission = $group->permissions()->ofItem($item)->first()) {
                 $allPermissionNames->push($permission->name);
             }
@@ -73,7 +73,7 @@ 
 
         $itemScopes = collect(Permission::available(Permission::SCOPE_ITEM))
             ->reverse()
-            ->mapWithKeys(function ($scope) { return [$scope => 0]; })
+            ->mapWithKeys(function($scope) { return [$scope => 0]; })
             ->toArray();
 
         foreach ($permissionNames as $name) {

src/PermissionAuthServiceProvider.php

Spacing +38 added lines, -38 removed lines

@@ -49,85 +49,85 @@ 
          *
          ***/
 
-        $this->define('edit-settings', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('edit-settings', function($user) {
+            return $this->authorize($user, function($user) {
                 return $user->role->permissions()->global()->where('name', 'edit-settings')->exists();
             });
         });
 
-        $this->define('edit-users', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('edit-users', function($user) {
+            return $this->authorize($user, function($user) {
                 return $user->role->permissions()->global()->where('name', 'edit-users')->exists();
             });
         });
 
-        $this->define('edit-user', function ($user, $editedUser) {
-            return $this->authorize($user, function ($user) use ($editedUser) {
+        $this->define('edit-user', function($user, $editedUser) {
+            return $this->authorize($user, function($user) use ($editedUser) {
                 return ($user->id === $editedUser->id)
                     || ($editedUser->role->position >= $user->role->position && $user->can('edit-users'));
             });
         });
 
-        $this->define('edit-user-roles', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('edit-user-roles', function($user) {
+            return $this->authorize($user, function($user) {
                 return $user->role->permissions()->global()->where('name', 'edit-user-roles')->exists();
             });
         });
 
-        $this->define('edit-role', function ($user, $editedRole) {
-            return $this->authorize($user, function ($user) use ($editedRole) {
+        $this->define('edit-role', function($user, $editedRole) {
+            return $this->authorize($user, function($user) use ($editedRole) {
                 return ($editedRole->position >= $user->role->position) && $user->can('edit-user-roles');
             });
         });
 
-        $this->define('edit-user-groups', function ($user) {
+        $this->define('edit-user-groups', function($user) {
             if (!in_array(Config::get('twill.permissions.level'), ['roleGroup', 'roleGroupItem'])) {
                 return false;
             }
 
-            return $this->authorize($user, function ($user) {
+            return $this->authorize($user, function($user) {
                 return $user->role->permissions()->global()->where('name', 'edit-user-groups')->exists();
             });
         });
 
-        $this->define('edit-group', function ($user, $editedGroup) {
-            return $this->authorize($user, function ($user) use ($editedGroup) {
+        $this->define('edit-group', function($user, $editedGroup) {
+            return $this->authorize($user, function($user) use ($editedGroup) {
                 return !$editedGroup->isEveryoneGroup() && $user->can('edit-user-groups');
             });
         });
 
-        $this->define('access-user-management', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('access-user-management', function($user) {
+            return $this->authorize($user, function($user) {
                 return $user->can('edit-users') || $user->can('edit-user-roles') || $user->can('edit-user-groups');
             });
         });
 
-        $this->define('manage-modules', function ($user) {
+        $this->define('manage-modules', function($user) {
             if (self::$useCache && isset(self::$cache['manage-modules'])) {
                 return self::$cache['manage-modules'];
             }
 
-            return self::$cache['manage-modules'] = $this->authorize($user, function ($user) {
+            return self::$cache['manage-modules'] = $this->authorize($user, function($user) {
                 return $user->role->permissions()->global()->where('name', 'manage-modules')->exists()
                 || isUserGroupPermissionModuleExists($user, 'global', 'manage-modules');
             });
         });
 
-        $this->define('access-media-library', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('access-media-library', function($user) {
+            return $this->authorize($user, function($user) {
                 return $user->can('edit-media-library')
                 || $user->role->permissions()->global()->where('name', 'access-media-library')->exists();
             });
         });
 
-        $this->define('edit-media-library', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('edit-media-library', function($user) {
+            return $this->authorize($user, function($user) {
                 return $user->role->permissions()->global()->where('name', 'edit-media-library')->exists();
             });
         });
 
-        $this->define('impersonate', function ($user) {
-            return $this->authorize($user, function ($user) {
+        $this->define('impersonate', function($user) {
+            return $this->authorize($user, function($user) {
                 return $user->is_superadmin;
             });
         });
@@ -138,48 +138,48 @@ 
          *
          ***/
 
-        $this->define('access-module-list', function ($user, $moduleName) {
+        $this->define('access-module-list', function($user, $moduleName) {
             if (self::$useCache && isset(self::$cache['access-module-list-' . $moduleName])) {
                 return self::$cache['access-module-list-' . $moduleName];
             }
 
-            return self::$cache['access-module-list-' . $moduleName] = $this->authorize($user, function ($user) use ($moduleName) {
+            return self::$cache['access-module-list-' . $moduleName] = $this->authorize($user, function($user) use ($moduleName) {
                 return $user->can('view-module', $moduleName)
                 || $user->allPermissions()->ofModuleName($moduleName)->exists();
             });
         });
 
         // The gate of accessing module list page,
-        $this->define('view-module', function ($user, $moduleName) {
+        $this->define('view-module', function($user, $moduleName) {
             if (self::$useCache && isset(self::$cache['view-module-' . $moduleName])) {
                 return self::$cache['view-module-' . $moduleName];
             }
 
-            return self::$cache['view-module-' . $moduleName] = $this->authorize($user, function ($user) use ($moduleName) {
+            return self::$cache['view-module-' . $moduleName] = $this->authorize($user, function($user) use ($moduleName) {
                 return $user->can('edit-module', $moduleName)
                 || $user->role->permissions()->ofModuleName($moduleName)->where('name', 'view-module')->exists()
                 || isUserGroupPermissionModuleExists($user, $moduleName, 'view-module');
             });
         });
 
-        $this->define('edit-module', function ($user, $moduleName) {
+        $this->define('edit-module', function($user, $moduleName) {
             if (self::$useCache && isset(self::$cache['edit-module-' . $moduleName])) {
                 return self::$cache['edit-module-' . $moduleName];
             }
 
-            return self::$cache['edit-module-' . $moduleName] = $this->authorize($user, function ($user) use ($moduleName) {
+            return self::$cache['edit-module-' . $moduleName] = $this->authorize($user, function($user) use ($moduleName) {
                 return $user->can('manage-module', $moduleName)
                 || $user->role->permissions()->module()->ofModuleName($moduleName)->where('name', 'edit-module')->exists()
                 || isUserGroupPermissionModuleExists($user, $moduleName, 'edit-module');
             });
         });
 
-        $this->define('manage-module', function ($user, $moduleName) {
+        $this->define('manage-module', function($user, $moduleName) {
             if (self::$useCache && isset(self::$cache['manage-module-' . $moduleName])) {
                 return self::$cache['manage-module-' . $moduleName];
             }
 
-            return self::$cache['manage-module-' . $moduleName] = $this->authorize($user, function ($user) use ($moduleName) {
+            return self::$cache['manage-module-' . $moduleName] = $this->authorize($user, function($user) use ($moduleName) {
                 if (!isPermissionableModule($moduleName)) {
                     return true;
                 }
@@ -195,13 +195,13 @@ 
          *
          ***/
 
-        $this->define('view-item', function ($user, $item) {
+        $this->define('view-item', function($user, $item) {
             $key = 'view-item-' . str_replace("\\", "-", get_class($item)) . '-' . $item->id;
             if (self::$useCache && isset(self::$cache[$key])) {
                 return self::$cache[$key];
             }
 
-            return self::$cache[$key] = $this->authorize($user, function ($user) use ($item) {
+            return self::$cache[$key] = $this->authorize($user, function($user) use ($item) {
                 return $item->public
                 || $user->can('edit-item', $item)
                 || $user->can('view-module', getModuleNameByModel(get_class($item)))
@@ -210,13 +210,13 @@ 
             });
         });
 
-        $this->define('edit-item', function ($user, $item) {
+        $this->define('edit-item', function($user, $item) {
             $key = 'edit-item-' . str_replace("\\", "-", get_class($item)) . '-' . $item->id;
             if (self::$useCache && isset(self::$cache[$key])) {
                 return self::$cache[$key];
             }
 
-            return self::$cache[$key] = $this->authorize($user, function ($user) use ($item) {
+            return self::$cache[$key] = $this->authorize($user, function($user) use ($item) {
                 return $user->can('manage-item', $item)
                 || $user->can('edit-module', getModuleNameByModel(get_class($item)))
                 || $user->permissions()->ofItem($item)->where('name', 'edit-item')->exists()
@@ -224,13 +224,13 @@ 
             });
         });
 
-        $this->define('manage-item', function ($user, $item) {
+        $this->define('manage-item', function($user, $item) {
             $key = 'manage-item-' . str_replace("\\", "-", get_class($item)) . '-' . $item->id;
             if (self::$useCache && isset(self::$cache[$key])) {
                 return self::$cache[$key];
             }
 
-            return self::$cache[$key] = $this->authorize($user, function ($user) use ($item) {
+            return self::$cache[$key] = $this->authorize($user, function($user) use ($item) {
                 return $user->can('manage-module', getModuleNameByModel(get_class($item)))
                 || $user->permissions()->ofItem($item)->where('name', 'manage-item')->exists()
                 || isUserGroupPermissionItemExists($user, $item, 'manage-item');