Merge pull request #24 from mostafamaklad/v1.2.2

V1.2.2
mostafamaklad · Sep 7, 2017 · c8451a6 · c8451a6
2 parents bdbf5d9 + 8ee39fb
commit c8451a6
Show file tree

Hide file tree

Showing 21 changed files with 152 additions and 104 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All Notable changes to `laravel-permission-mongodb` will be documented in this file.
 
+## 1.2.2 - 2017-09-07
+
+### Fixed
+- Recreate Exceptions
+- Fix most PHP Code Sniffer errors
+- Fix some PHP Mess Detector errors
+
 ## 1.2.1 - 2017-09-05
 
 ### Added

diff --git a/src/Commands/CreatePermission.php b/src/Commands/CreatePermission.php
@@ -1,10 +1,15 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Commands;
 
 use Illuminate\Console\Command;
 use Maklad\Permission\Contracts\PermissionInterface as Permission;
 
+/**
+ * Class CreatePermission
+ * @package Maklad\Permission\Commands
+ */
 class CreatePermission extends Command
 {
     protected $signature = 'permission:create-permission 
@@ -15,11 +20,11 @@ class CreatePermission extends Command
 
     public function handle()
     {
-        $permissionClass = app(Permission::class);
+        $permissionClass = \app(Permission::class);
 
         $permission = $permissionClass::create([
             'name'       => $this->argument('name'),
-            'guard_name' => $this->argument('guard'),
+            'guard_name' => $this->argument('guard')
         ]);
 
         $this->info("Permission `{$permission->name}` created");

diff --git a/src/Commands/CreateRole.php b/src/Commands/CreateRole.php
@@ -1,10 +1,15 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Commands;
 
 use Illuminate\Console\Command;
 use Maklad\Permission\Contracts\RoleInterface as Role;
 
+/**
+ * Class CreateRole
+ * @package Maklad\Permission\Commands
+ */
 class CreateRole extends Command
 {
     protected $signature = 'permission:create-role
@@ -15,11 +20,11 @@ class CreateRole extends Command
 
     public function handle()
     {
-        $roleClass = app(Role::class);
+        $roleClass = \app(Role::class);
 
         $role = $roleClass::create([
             'name'       => $this->argument('name'),
-            'guard_name' => $this->argument('guard'),
+            'guard_name' => $this->argument('guard')
         ]);
 
         $this->info("Role `{$role->name}` created");

diff --git a/src/Contracts/PermissionInterface.php b/src/Contracts/PermissionInterface.php
@@ -1,10 +1,15 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Contracts;
 
 use Jenssegers\Mongodb\Relations\BelongsToMany;
 use Maklad\Permission\Exceptions\PermissionDoesNotExist;
 
+/**
+ * Interface PermissionInterface
+ * @package Maklad\Permission\Contracts
+ */
 interface PermissionInterface
 {
     /**

diff --git a/src/Contracts/RoleInterface.php b/src/Contracts/RoleInterface.php
@@ -1,11 +1,15 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Contracts;
 
 use Jenssegers\Mongodb\Relations\BelongsToMany;
 use Maklad\Permission\Exceptions\RoleDoesNotExist;
-use Maklad\Permission\Models\Permission;
 
+/**
+ * Interface RoleInterface
+ * @package Maklad\Permission\Contracts
+ */
 interface RoleInterface
 {
     /**

diff --git a/src/Exceptions/GuardDoesNotMatch.php b/src/Exceptions/GuardDoesNotMatch.php
@@ -1,20 +1,12 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Exceptions;
 
-use Throwable;
-
+/**
+ * Class GuardDoesNotMatch
+ * @package Maklad\Permission\Exceptions
+ */
 class GuardDoesNotMatch extends MakladException
 {
-    /**
-     * GuardDoesNotMatch constructor.
-     *
-     * @param string $message
-     * @param int $code
-     * @param Throwable|null $previous
-     */
-    public function __construct($message = "", $code = 0, Throwable $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-    }
 }
diff --git a/src/Exceptions/MakladException.php b/src/Exceptions/MakladException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: mostafamaklad
@@ -11,6 +12,10 @@
 use InvalidArgumentException;
 use Throwable;
 
+/**
+ * Class MakladException
+ * @package Maklad\Permission\Exceptions
+ */
 class MakladException extends InvalidArgumentException
 {
     /**
@@ -20,12 +25,12 @@ class MakladException extends InvalidArgumentException
      * @param int $code
      * @param Throwable|null $previous
      */
-    public function __construct($message = "", $code = 0, Throwable $previous = null)
+    public function __construct($message = '', $code = 0, Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
-        if (config('permission.log_registration_exception')) {
-            $logger = app('log');
+        if (\config('permission.log_registration_exception')) {
+            $logger = \app('log');
             $logger->alert($message);
         }
     }

diff --git a/src/Exceptions/PermissionAlreadyExists.php b/src/Exceptions/PermissionAlreadyExists.php
@@ -1,20 +1,12 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Exceptions;
 
-use Throwable;
-
+/**
+ * Class PermissionAlreadyExists
+ * @package Maklad\Permission\Exceptions
+ */
 class PermissionAlreadyExists extends MakladException
 {
-    /**
-     * PermissionAlreadyExists constructor.
-     *
-     * @param string $message
-     * @param int $code
-     * @param Throwable|null $previous
-     */
-    public function __construct($message = "", $code = 0, Throwable $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-    }
 }
diff --git a/src/Exceptions/PermissionDoesNotExist.php b/src/Exceptions/PermissionDoesNotExist.php
@@ -1,20 +1,12 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Exceptions;
 
-use Throwable;
-
+/**
+ * Class PermissionDoesNotExist
+ * @package Maklad\Permission\Exceptions
+ */
 class PermissionDoesNotExist extends MakladException
 {
-    /**
-     * PermissionDoesNotExist constructor.
-     *
-     * @param string $message
-     * @param int $code
-     * @param Throwable|null $previous
-     */
-    public function __construct($message = "", $code = 0, Throwable $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-    }
 }
diff --git a/src/Exceptions/RoleAlreadyExists.php b/src/Exceptions/RoleAlreadyExists.php
@@ -1,20 +1,12 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Exceptions;
 
-use Throwable;
-
+/**
+ * Class RoleAlreadyExists
+ * @package Maklad\Permission\Exceptions
+ */
 class RoleAlreadyExists extends MakladException
 {
-    /**
-     * RoleAlreadyExists constructor.
-     *
-     * @param string $message
-     * @param int $code
-     * @param Throwable|null $previous
-     */
-    public function __construct($message = "", $code = 0, Throwable $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-    }
 }
diff --git a/src/Exceptions/RoleDoesNotExist.php b/src/Exceptions/RoleDoesNotExist.php
@@ -1,20 +1,12 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Exceptions;
 
-use Throwable;
-
+/**
+ * Class RoleDoesNotExist
+ * @package Maklad\Permission\Exceptions
+ */
 class RoleDoesNotExist extends MakladException
 {
-    /**
-     * RoleDoesNotExist constructor.
-     *
-     * @param string $message
-     * @param int $code
-     * @param Throwable|null $previous
-     */
-    public function __construct($message = "", $code = 0, Throwable $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-    }
 }
diff --git a/src/Helpers.php b/src/Helpers.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission;
 

diff --git a/src/Middlewares/PermissionMiddleware.php b/src/Middlewares/PermissionMiddleware.php
@@ -1,23 +1,35 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Middlewares;
 
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
+/**
+ * Class PermissionMiddleware
+ * @package Maklad\Permission\Middlewares
+ */
 class PermissionMiddleware
 {
+    /**
+     * @param $request
+     * @param Closure $next
+     * @param $permission
+     *
+     * @return mixed
+     */
     public function handle($request, Closure $next, $permission)
     {
         if (Auth::guest()) {
-            abort(403);
+            \abort(403);
         }
 
-        $permission = is_array($permission) ? $permission : explode('|', $permission);
+        $permissions = \is_array($permission) ? $permission : \explode('|', $permission);
 
 
-        if (! Auth::user()->hasAnyPermission($permission)) {
-            abort(403);
+        if (! Auth::user()->hasAnyPermission($permissions)) {
+            \abort(403);
         }
 
         return $next($request);

diff --git a/src/Middlewares/RoleMiddleware.php b/src/Middlewares/RoleMiddleware.php
@@ -1,22 +1,34 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Middlewares;
 
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
+/**
+ * Class RoleMiddleware
+ * @package Maklad\Permission\Middlewares
+ */
 class RoleMiddleware
 {
+    /**
+     * @param $request
+     * @param Closure $next
+     * @param $role
+     *
+     * @return mixed
+     */
     public function handle($request, Closure $next, $role)
     {
         if (Auth::guest()) {
-            abort(403);
+            \abort(403);
         }
 
-        $role = is_array($role) ? $role : explode('|', $role);
+        $roles = \is_array($role) ? $role : \explode('|', $role);
 
-        if (! Auth::user()->hasAnyRole($role)) {
-            abort(403);
+        if (! Auth::user()->hasAnyRole($roles)) {
+            \abort(403);
         }
 
         return $next($request);

diff --git a/src/Models/Permission.php b/src/Models/Permission.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Maklad\Permission\Models;
 
@@ -12,6 +13,10 @@
 use Maklad\Permission\PermissionRegistrar;
 use Maklad\Permission\Traits\RefreshesPermissionCache;
 
+/**
+ * Class Permission
+ * @package Maklad\Permission\Models
+ */
 class Permission extends Model implements PermissionInterface
 {
     use RefreshesPermissionCache;