Merge branch 'master' into l9-compatibility

Author: jeremykenedy

.travis.yml

@@ -1,11 +1,10 @@
 language: php
 sudo: required
-dist: trusty
+dist: focal
 group: edge
 
 php:
-  - 7.3
-  - 7.4
+  - 8.1
 
 sudo: false
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "jeremykenedy/laravel-roles",
-    "description": "A Powerful package for handling roles and permissions in Laravel. Supports Laravel 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 6.0, and 7.0.",
+    "description": "A Powerful package for handling roles and permissions in Laravel. Supports Laravel 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 6.0, 7.0, 8.0 and 9.0.",
     "keywords": [
         "laravel-roles",
         "laravel-permissions",
@@ -24,17 +24,23 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
+        "php": "^7.2|^8.0.2|^8.1",
         "laravel/framework": "5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|^9.0",
-        "eklundkristoffer/seedster": "^4.0",
-        "laravel/helpers": "^1.3"
+        "eklundkristoffer/seedster": "dev-l9-support",
+        "laravel/helpers": "^1.5"
     },
     "require-dev": {
         "orchestra/testbench": "^6.0|^7.0",
-        "laravel/tinker": "^2.4",
+        "laravel/tinker": "^2.7",
         "illuminate/support": "^8.5|^9.0",
-        "laravel/laravel": "^8.0"
+        "laravel/laravel": "^8.0|^9.0"
     },
+	"repositories": [
+		{
+			"type": "vcs",
+			"url": "https://github.com/rafaelqm/seedster.git"
+		}
+	],
     "autoload": {
         "psr-4": {
             "jeremykenedy\\LaravelRoles\\": "src/"

readme.md

@@ -547,30 +547,29 @@ You can catch these exceptions inside `app/Exceptions/Handler.php` file and do w
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
+     * @param  \Throwable  $e
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
-    {
-
-        $userLevelCheck = $exception instanceof \jeremykenedy\LaravelRoles\App\Exceptions\RoleDeniedException ||
-            $exception instanceof \jeremykenedy\LaravelRoles\App\Exceptions\PermissionDeniedException ||
-            $exception instanceof \jeremykenedy\LaravelRoles\App\Exceptions\LevelDeniedException;
-
-        if ($userLevelCheck) {
-
-            if ($request->expectsJson()) {
-                return Response::json(array(
-                    'error'    =>  403,
-                    'message'   =>  'Unauthorized.'
-                ), 403);
-            }
-
-            abort(403);
-        }
-
-        return parent::render($request, $exception);
-    }
+    public function render($request, Throwable $e)
+	{
+		$userLevelCheck = $e instanceof \jeremykenedy\LaravelRoles\App\Exceptions\RoleDeniedException ||
+			$e instanceof \jeremykenedy\LaravelRoles\App\Exceptions\PermissionDeniedException ||
+			$e instanceof \jeremykenedy\LaravelRoles\App\Exceptions\LevelDeniedException;
+		
+		if ($userLevelCheck) {
+			
+			if ($request->expectsJson()) {
+				return Response::json(array(
+					'error'    =>  403,
+					'message'   =>  'Unauthorized.'
+				), 403);
+			}
+			
+			abort(403);
+		}
+		
+		return parent::render($request, $e);
+	}
 ```
 
 ---

src/Traits/HasRoleAndPermission.php

@@ -44,7 +44,22 @@ public function roles()
      */
     public function getRoles()
     {
-        return (!$this->roles) ? $this->roles = $this->roles()->get() : $this->roles;
+        if (!$this->roles) {
+            if (method_exists($this, 'loadMissing')) {
+                $this->loadMissing('roles');
+            } else {
+                if (!array_key_exists('roles', $this->relations)) {
+                    $this->load('roles');
+                }
+            }
+            if (method_exists($this, 'getRelation')) {
+                $this->roles = $this->getRelation('roles');
+            } else {
+                $this->roles = $this->relations['roles'];
+            }
+        }
+
+        return $this->roles;
     }
 
     /**
@@ -130,7 +145,7 @@ public function attachRole($role)
         if ($this->getRoles()->contains($role)) {
             return true;
         }
-        $this->roles = null;
+        $this->resetRoles();
 
         return $this->roles()->attach($role);
     }
@@ -144,7 +159,7 @@ public function attachRole($role)
      */
     public function detachRole($role)
     {
-        $this->roles = null;
+        $this->resetRoles();
 
         return $this->roles()->detach($role);
     }
@@ -156,7 +171,7 @@ public function detachRole($role)
      */
     public function detachAllRoles()
     {
-        $this->roles = null;
+        $this->resetRoles();
 
         return $this->roles()->detach();
     }
@@ -170,7 +185,7 @@ public function detachAllRoles()
      */
     public function syncRoles($roles)
     {
-        $this->roles = null;
+        $this->resetRoles();
 
         return $this->roles()->sync($roles);
     }
@@ -442,6 +457,16 @@ private function getArrayFrom($argument)
         return (!is_array($argument)) ? preg_split('/ ?[,|] ?/', $argument) : $argument;
     }
 
+    protected function resetRoles()
+    {
+        $this->roles = null;
+        if (method_exists($this, 'unsetRelation')) {
+            $this->unsetRelation('roles');
+        } else {
+            unset($this->relations['roles']);
+        }
+    }
+
     public function callMagic($method, $parameters)
     {
         if (starts_with($method, 'is')) {