Bladeren bron

Merge pull request #1166 from jqhph/analysis-BMe13A

Apply fixes from StyleCI
Jiang Qinghua 4 jaren geleden
bovenliggende
commit
29e9748a6f
4 gewijzigde bestanden met toevoegingen van 8 en 6 verwijderingen
  1. 1 1
      config/admin.php
  2. 3 2
      src/Http/Auth/Permission.php
  3. 1 1
      src/Http/Controllers/RoleController.php
  4. 3 2
      src/Traits/HasPermissions.php

+ 1 - 1
config/admin.php

@@ -242,7 +242,7 @@ return [
         ],
 
         // Image and file access protocol http or https.
-        'domain_type' => 'default'
+        'domain_type' => 'default',
     ],
 
     /*

+ 3 - 2
src/Http/Auth/Permission.php

@@ -51,7 +51,7 @@ class Permission
             return true;
         }
 
-        if (!Admin::user()->inRoles($roles)) {
+        if (! Admin::user()->inRoles($roles)) {
             static::error();
         }
     }
@@ -112,7 +112,8 @@ class Permission
     public static function isAdministrator()
     {
         $roleModel = config('admin.database.roles_model');
-        return !config('admin.permission.enable') || Admin::user()->isRole($roleModel::ADMINISTRATOR);
+
+        return ! config('admin.permission.enable') || Admin::user()->isRole($roleModel::ADMINISTRATOR);
     }
 
     /**

+ 1 - 1
src/Http/Controllers/RoleController.php

@@ -98,7 +98,7 @@ class RoleController extends AdminController
                     return $permissionModel->allNodes();
                 })
                 ->customFormat(function ($v) {
-                    if (!$v) {
+                    if (! $v) {
                         return [];
                     }
 

+ 3 - 2
src/Traits/HasPermissions.php

@@ -37,7 +37,7 @@ trait HasPermissions
      */
     public function can($ability): bool
     {
-        if (!$ability) {
+        if (! $ability) {
             return false;
         }
 
@@ -62,7 +62,7 @@ trait HasPermissions
      */
     public function cannot(string $permission): bool
     {
-        return !$this->can($permission);
+        return ! $this->can($permission);
     }
 
     /**
@@ -73,6 +73,7 @@ trait HasPermissions
     public function isAdministrator(): bool
     {
         $roleModel = config('admin.database.roles_model');
+
         return $this->isRole($roleModel::ADMINISTRATOR);
     }