mr-luke / privileges

src/Detector.php

Spacing +7 added lines, -7 removed lines

@@ -89,9 +89,9 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (!$this->checkRestrictions()) return $this->denied;
 
-        return $this->hasModel($model, $relation) ? $this->allowed: $this->denied;
+        return $this->hasModel($model, $relation) ? $this->allowed : $this->denied;
     }
 
     /**
@@ -108,7 +108,7 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (!$this->checkRestrictions()) return $this->denied;
 
         if ($this->hasModel($model, $relation)) return $this->allowed;
 
@@ -128,7 +128,7 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (!$this->checkRestrictions()) return $this->denied;
 
         return $this->hasLevel($min) ? $this->allowed : $this->denied;
     }
@@ -147,7 +147,7 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (!$this->checkRestrictions()) return $this->denied;
 
         return $this->isOwner($model, $foreign) ? $this->allowed : $this->denied;
     }
@@ -167,7 +167,7 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (!$this->checkRestrictions()) return $this->denied;
 
         if ($this->isOwner($model, $foreign)) return $this->allowed;
 
@@ -202,7 +202,7 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (!$this->checkRestrictions()) return $this->denied;
 
         return $this->isSharing($model, $modelRelation, $relation) ?
             $this->allowed : $this->denied;

Braces +24 added lines, -8 removed lines

@@ -89,7 +89,9 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (! $this->checkRestrictions()) {
+            return $this->denied;
+        }
 
         return $this->hasModel($model, $relation) ? $this->allowed: $this->denied;
     }
@@ -108,9 +110,13 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (! $this->checkRestrictions()) {
+            return $this->denied;
+        }
 
-        if ($this->hasModel($model, $relation)) return $this->allowed;
+        if ($this->hasModel($model, $relation)) {
+            return $this->allowed;
+        }
 
         return $this->hasLevel($min) ? $this->allowed : $this->denied;
     }
@@ -128,7 +134,9 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (! $this->checkRestrictions()) {
+            return $this->denied;
+        }
 
         return $this->hasLevel($min) ? $this->allowed : $this->denied;
     }
@@ -147,7 +155,9 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (! $this->checkRestrictions()) {
+            return $this->denied;
+        }
 
         return $this->isOwner($model, $foreign) ? $this->allowed : $this->denied;
     }
@@ -167,9 +177,13 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (! $this->checkRestrictions()) {
+            return $this->denied;
+        }
 
-        if ($this->isOwner($model, $foreign)) return $this->allowed;
+        if ($this->isOwner($model, $foreign)) {
+            return $this->allowed;
+        }
 
         return $this->hasLevel($min) ? $this->allowed : $this->denied;
     }
@@ -202,7 +216,9 @@ 
 
         // First we need to check restritions for given Role
         // to detect special Location, IP, Hours conditions.
-        if (! $this->checkRestrictions()) return $this->denied;
+        if (! $this->checkRestrictions()) {
+            return $this->denied;
+        }
 
         return $this->isSharing($model, $modelRelation, $relation) ?
             $this->allowed : $this->denied;

database/migrations/2018_10_14_120000_create_priv_roles_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('priv_roles', function (Blueprint $table) {
+        Schema::create('priv_roles', function(Blueprint $table) {
             $table->increments('id');
             $table->string('name')->unique();
             $table->unsignedTinyInteger('level')->default(0); // Visitor,Employee,Manager,Director

database/migrations/2018_10_14_120002_create_priv_user_role_table.php

Indentation +4 added lines, -4 removed lines

@@ -34,12 +34,12 @@
             $table->unsignedInteger('role_id');
 
             $table->foreign('auth_id')
-                  ->references($config['key'])->on($config['table'])
-                  ->onDelete('CASCADE');
+                    ->references($config['key'])->on($config['table'])
+                    ->onDelete('CASCADE');
 
             $table->foreign('role_id')
-                  ->references('id')->on('priv_roles')
-                  ->onDelete('CASCADE');
+                    ->references('id')->on('priv_roles')
+                    ->onDelete('CASCADE');
         });
     }
 

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     {
         $config = Manager::getAuthorizableMigration();
 
-        Schema::create('priv_auth_role', function (Blueprint $table) use ($config) {
+        Schema::create('priv_auth_role', function(Blueprint $table) use ($config) {
             // Depend on Authorizable table structure
             // package provides support for tree types
             // of primaryKey: integer, string & uuid.

database/migrations/2018_10_14_120001_create_priv_permissions_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('priv_permissions', function (Blueprint $table) {
+        Schema::create('priv_permissions', function(Blueprint $table) {
             $table->increments('id');
             $table->morphs('grantable');
             $table->string('scope');

src/PrivilegesServiceProvider.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
     {
         $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
 
-        $this->publishes([__DIR__ .'/../config/privileges.php' => config_path('privileges.php')], 'config');
+        $this->publishes([__DIR__.'/../config/privileges.php' => config_path('privileges.php')], 'config');
 
         $this->publishes([__DIR__.'/../database/migrations/' => database_path('migrations')], 'migrations');
     }
@@ -38,16 +38,16 @@ 
      */
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__ .'/../config/privileges.php', 'privileges');
+        $this->mergeConfigFrom(__DIR__.'/../config/privileges.php', 'privileges');
 
-        $this->app->singleton('mrluke-privileges-detector', function ($app) {
+        $this->app->singleton('mrluke-privileges-detector', function($app) {
 
             $manager = $app->make('mrluke-privileges-manager');
 
             return new \Mrluke\Privileges\Detector($manager);
         });
 
-        $this->app->singleton('mrluke-privileges-manager', function ($app) {
+        $this->app->singleton('mrluke-privileges-manager', function($app) {
 
             $schema = \Mrluke\Configuration\Schema::createFromFile(
                 __DIR__.'/../config/schema.json',

src/Manager.php

Spacing +2 added lines, -2 removed lines

@@ -170,7 +170,7 @@ 
     public function detectScope(string $model)
     {
         return $this->config->get(
-            'mapping.' . $model,
+            'mapping.'.$model,
             $this->config->get('mapping_default')
         );
     }
@@ -233,7 +233,7 @@ 
         if (':*' === substr($scope, -2)) {
             $scope = substr($scope, 0, -2);
 
-            return $subject->permissions->sortbyDesc('level')->first(function ($perm) use ($scope) {
+            return $subject->permissions->sortbyDesc('level')->first(function($perm) use ($scope) {
                 return preg_match("/^(${scope}$|${scope}:)/", $perm['scope']);
             });
         }

src/PermissionResolver.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
      */
     public static function getScopeRestrictions($subject, string $scope, int $level = null): array
     {
-        $scopes = $subject->roles->flatMap(function ($role) use ($scope, $level) {
+        $scopes = $subject->roles->flatMap(function($role) use ($scope, $level) {
             if ($level) {
                 $permissions = $role->permissions->where('level', $level);
             } else {
@@ -31,8 +31,8 @@ 
             return preg_grep("/^${scope}:/", array_column($permissions->toArray(), 'scope'));
         })->toArray();
 
-        return array_map(function ($val) use ($scope) {
-            return str_replace($scope . ':', '', $val);
+        return array_map(function($val) use ($scope) {
+            return str_replace($scope.':', '', $val);
         }, $scopes);
     }
 }