Merge b9f2cab into 24cb378

mostafamaklad · Sep 6, 2017 · 2cba0a9 · 2cba0a9
2 parents 24cb378 + b9f2cab
commit 2cba0a9
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 40 deletions.
diff --git a/src/Exceptions/GuardDoesNotMatch.php b/src/Exceptions/GuardDoesNotMatch.php
@@ -4,18 +4,14 @@
 
 use InvalidArgumentException;
 use Illuminate\Support\Collection;
+use Maklad\Permission\Helpers;
 
 class GuardDoesNotMatch extends InvalidArgumentException
 {
     public static function create(string $givenGuard, Collection $expectedGuards)
     {
-        $message = new static("The given role or permission should use guard `{$expectedGuards->implode(', ')}` instead of `{$givenGuard}`.");
-
-        if (config('permission.log_registration_exception')) {
-            $logger = app('log');
-            $logger->alert($message);
-        }
-
-        return $message;
+        $expected = $expectedGuards->implode(', ');
+        $message = "The given role or permission should use guard `{$expected}` instead of `{$givenGuard}`.";
+        return new self(Helpers::logAlertMessage($message));
     }
 }
diff --git a/src/Exceptions/PermissionAlreadyExists.php b/src/Exceptions/PermissionAlreadyExists.php
@@ -3,18 +3,14 @@
 namespace Maklad\Permission\Exceptions;
 
 use InvalidArgumentException;
+use Maklad\Permission\Helpers;
 
 class PermissionAlreadyExists extends InvalidArgumentException
 {
     public static function create(string $permissionName, string $guardName)
     {
-        $message = new static("A permission `{$permissionName}` already exists for guard `{$guardName}`.");
+        $message = "A permission `{$permissionName}` already exists for guard `{$guardName}`.";
 
-        if (config('permission.log_registration_exception')) {
-            $logger = app('log');
-            $logger->alert($message);
-        }
-
-        return $message;
+        return new self(Helpers::logAlertMessage($message));
     }
 }
diff --git a/src/Exceptions/PermissionDoesNotExist.php b/src/Exceptions/PermissionDoesNotExist.php
@@ -3,18 +3,14 @@
 namespace Maklad\Permission\Exceptions;
 
 use InvalidArgumentException;
+use Maklad\Permission\Helpers;
 
 class PermissionDoesNotExist extends InvalidArgumentException
 {
     public static function create(string $permissionName, string $guardName = '')
     {
-        $message = new static("There is no permission named `{$permissionName}` for guard `{$guardName}`.");
+        $message = "There is no permission named `{$permissionName}` for guard `{$guardName}`.";
 
-        if (config('permission.log_registration_exception')) {
-            $logger = app('log');
-            $logger->alert($message);
-        }
-
-        return $message;
+        return new self(Helpers::logAlertMessage($message));
     }
 }
diff --git a/src/Exceptions/RoleAlreadyExists.php b/src/Exceptions/RoleAlreadyExists.php
@@ -3,18 +3,12 @@
 namespace Maklad\Permission\Exceptions;
 
 use InvalidArgumentException;
+use Maklad\Permission\Helpers;
 
 class RoleAlreadyExists extends InvalidArgumentException
 {
     public static function create(string $roleName, string $guardName)
     {
-        $message = new static("A role `{$roleName}` already exists for guard `{$guardName}`.");
-
-        if (config('permission.log_registration_exception')) {
-            $logger = app('log');
-            $logger->alert($message);
-        }
-
-        return $message;
+        return new self(Helpers::logAlertMessage("A role `{$roleName}` already exists for guard `{$guardName}`."));
     }
 }
diff --git a/src/Exceptions/RoleDoesNotExist.php b/src/Exceptions/RoleDoesNotExist.php
@@ -3,18 +3,12 @@
 namespace Maklad\Permission\Exceptions;
 
 use InvalidArgumentException;
+use Maklad\Permission\Helpers;
 
 class RoleDoesNotExist extends InvalidArgumentException
 {
     public static function create(string $roleName)
     {
-        $message = new static("There is no role named `{$roleName}`.");
-
-        if (config('permission.log_registration_exception')) {
-            $logger = app('log');
-            $logger->alert($message);
-        }
-
-        return $message;
+        return new self(Helpers::logAlertMessage("There is no role named `{$roleName}`."));
     }
 }
diff --git a/src/Helpers.php b/src/Helpers.php
@@ -16,4 +16,20 @@ public static function getModelForGuard(string $guard)
                 return config("auth.providers.{$guard['provider']}.model");
             })->get($guard);
     }
+
+    /**
+     * Log Alert Message
+     * @param string $message
+     *
+     * @return string
+     */
+    public static function logAlertMessage(string $message):string
+    {
+        if (config('permission.log_registration_exception')) {
+            $logger = app('log');
+            $logger->alert($message);
+        }
+
+        return $message;
+    }
 }
diff --git a/src/Models/Permission.php b/src/Models/Permission.php
@@ -31,8 +31,10 @@ public static function create(array $attributes = [])
     {
         $attributes['guard_name'] = $attributes['guard_name'] ?? config('auth.defaults.guard');
 
-        if (static::getPermissions()->where('name', $attributes['name'])->where('guard_name',
-            $attributes['guard_name'])->first()) {
+        if (static::getPermissions()->where('name', $attributes['name'])->where(
+            'guard_name',
+            $attributes['guard_name']
+        )->first()) {
             throw PermissionAlreadyExists::create($attributes['name'], $attributes['guard_name']);
         }