Merge pull request #67 from lucasmichot/feature/code-style

Enforce PSR2

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.yml]
+indent_style = space
+indent_size = 2

.gitignore

@@ -2,4 +2,5 @@
 composer.phar
 composer.lock
 .DS_Store
+.php_cs.cache
 .idea

.php_cs

@@ -0,0 +1,14 @@
+<?php
+
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->in(__DIR__);
+
+$fixers = [
+    'short_array_syntax',
+];
+
+return Symfony\CS\Config\Config::create()
+    ->setUsingCache(true)
+    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+    ->fixers($fixers)
+    ->finder($finder);

.styleci.yml

@@ -0,0 +1,4 @@
+preset: psr2
+
+enabled:
+  - short_array_syntax

src/Bican/Roles/Middleware/VerifyPermission.php

@@ -35,7 +35,9 @@ public function __construct(Guard $auth)
      */
     public function handle($request, Closure $next, $permission)
     {
-        if ($this->auth->check() && $this->auth->user()->can($permission)) { return $next($request); }
+        if ($this->auth->check() && $this->auth->user()->can($permission)) {
+            return $next($request);
+        }
 
         throw new PermissionDeniedException($permission);
     }

src/Bican/Roles/Middleware/VerifyRole.php

@@ -35,7 +35,9 @@ public function __construct(Guard $auth)
      */
     public function handle($request, Closure $next, $role)
     {
-        if ($this->auth->check() && $this->auth->user()->is($role)) { return $next($request); }
+        if ($this->auth->check() && $this->auth->user()->is($role)) {
+            return $next($request);
+        }
 
         throw new RoleDeniedException($role);
     }

src/Bican/Roles/Models/Permission.php

@@ -28,6 +28,8 @@ public function __construct(array $attributes = [])
     {
         parent::__construct($attributes);
 
-        if ($connection = config('roles.connection')) { $this->connection = $connection; }
+        if ($connection = config('roles.connection')) {
+            $this->connection = $connection;
+        }
     }
 }

src/Bican/Roles/Models/Role.php

@@ -28,6 +28,8 @@ public function __construct(array $attributes = [])
     {
         parent::__construct($attributes);
 
-        if ($connection = config('roles.connection')) { $this->connection = $connection; }
+        if ($connection = config('roles.connection')) {
+            $this->connection = $connection;
+        }
     }
 }

src/Bican/Roles/Traits/HasRoleAndPermission.php

@@ -50,7 +50,9 @@ public function getRoles()
      */
     public function is($role, $all = false)
     {
-        if ($this->isPretendEnabled()) { return $this->pretend('is'); }
+        if ($this->isPretendEnabled()) {
+            return $this->pretend('is');
+        }
 
         return $this->{$this->getMethodName('is', $all)}($this->getArrayFrom($role));
     }
@@ -64,7 +66,9 @@ public function is($role, $all = false)
     protected function isOne(array $roles)
     {
         foreach ($roles as $role) {
-            if ($this->hasRole($role)) { return true; }
+            if ($this->hasRole($role)) {
+                return true;
+            }
         }
 
         return false;
@@ -79,7 +83,9 @@ protected function isOne(array $roles)
     protected function isAll(array $roles)
     {
         foreach ($roles as $role) {
-            if (!$this->hasRole($role)) { return false; }
+            if (!$this->hasRole($role)) {
+                return false;
+            }
         }
 
         return true;
@@ -147,7 +153,9 @@ public function level()
      */
     public function rolePermissions()
     {
-        if (!$roles = $this->getRoles()->lists('id')->toArray()) { $roles = []; }
+        if (!$roles = $this->getRoles()->lists('id')->toArray()) {
+            $roles = [];
+        }
 
         $prefix = config('database.connections.' . config('database.default') . '.prefix');
 
@@ -186,7 +194,9 @@ public function getPermissions()
      */
     public function can($permission, $all = false)
     {
-        if ($this->isPretendEnabled()) { return $this->pretend('can'); }
+        if ($this->isPretendEnabled()) {
+            return $this->pretend('can');
+        }
 
         return $this->{$this->getMethodName('can', $all)}($this->getArrayFrom($permission));
     }
@@ -200,7 +210,9 @@ public function can($permission, $all = false)
     protected function canOne(array $permissions)
     {
         foreach ($permissions as $permission) {
-            if ($this->hasPermission($permission)) { return true; }
+            if ($this->hasPermission($permission)) {
+                return true;
+            }
         }
 
         return false;
@@ -215,7 +227,9 @@ protected function canOne(array $permissions)
     protected function canAll(array $permissions)
     {
         foreach ($permissions as $permission) {
-            if (!$this->hasPermission($permission)) { return false; }
+            if (!$this->hasPermission($permission)) {
+                return false;
+            }
         }
 
         return true;
@@ -245,9 +259,13 @@ protected function hasPermission($permission)
      */
     public function allowed($providedPermission, Model $entity, $owner = true, $ownerColumn = 'user_id')
     {
-        if ($this->isPretendEnabled()) { return $this->pretend('allowed'); }
+        if ($this->isPretendEnabled()) {
+            return $this->pretend('allowed');
+        }
 
-        if ($owner === true && $entity->{$ownerColumn} == $this->id) { return true; }
+        if ($owner === true && $entity->{$ownerColumn} == $this->id) {
+            return true;
+        }
 
         return $this->isAllowed($providedPermission, $entity);
     }
@@ -264,7 +282,9 @@ protected function isAllowed($providedPermission, Model $entity)
         foreach ($this->getPermissions() as $permission) {
             if ($permission->model != '' && get_class($entity) == $permission->model
                 && ($permission->id == $providedPermission || $permission->slug === $providedPermission)
-            ) { return true; }
+            ) {
+                return true;
+            }
         }
 
         return false;

src/config/roles.php

@@ -35,7 +35,7 @@
     |
     | If you want, you can replace default models from this package by models
     | you created. Have a look at `Bican\Roles\Models\Role` model and
-    | `Bican\Roles\Models\Permission` model. 
+    | `Bican\Roles\Models\Permission` model.
     |
     */