Use a more concise syntax: guard:api|web.

Author: derekrprice

src/Middleware/LaratrustMiddleware.php

@@ -78,28 +78,22 @@ protected function assignRealValuesTo($team, $options)
         return [
             (Str::contains($team, ['require_all', 'guard:']) ? null : $team),
             (Str::contains($team, 'require_all') ?: Str::contains($options, 'require_all')),
-            (Str::contains($team, 'guard:') ? $this->extractGuards($team) : (
-                Str::contains($options, 'guard:')
-                ? $this->extractGuards($options)
-                : [Config::get('auth.defaults.guard')]
-            )),
+            ($this->extractGuards($team) ?: $this->extractGuards($options) ?: [Config::get('auth.defaults.guard')]),
         ];
     }
 
     /**
      * Extract the guard type from the given string.
      *
      * @param  string $string
-     * @return string
+     * @return array
      */
     protected function extractGuards($string)
     {
-        $options = Collection::make(explode('|', $string));
-
-        return $options->reject(function ($option) {
-            return strpos($option, 'guard:') === false;
-        })->map(function ($option) {
-            return explode(':', $option)[1];
-        });
+        return preg_match("/\\bguard:((?:[^|,]+)(?:[|][^|,]+)*)\b/", $string, $matches)
+            ? Collection::make(explode("|", $matches[1]))->reject(function ($value, $key) {
+                return $value == "require_all";
+            })
+            : [];
     }
 }

tests/Middleware/LaratrustPermissionTest.php

@@ -181,19 +181,19 @@ public function testHandle_IsLoggedInWithPermissionAndMultipleGuards_ShouldNotAb
         }, 'users-create|users-update'));
 
         $this->assertNull($middleware->handle($this->request, function () {
-        }, 'users-create|users-update', 'guard:api|guard:web'));
+        }, 'users-create|users-update', 'guard:api|web'));
 
         $this->assertNull($middleware->handle($this->request, function () {
         }, 'users-create|users-update', 'require_all'));
 
         $this->assertNull($middleware->handle($this->request, function () {
-        }, 'users-create|users-update', 'guard:api|guard:web|require_all'));
+        }, 'users-create|users-update', 'guard:api|web,require_all'));
 
         $this->assertNull($middleware->handle($this->request, function () {
         }, 'users-create|users-update', 'TeamA', 'require_all'));
 
         $this->assertNull($middleware->handle($this->request, function () {
-        }, 'users-create|users-update', 'TeamA', 'guard:api|guard:web|require_all'));
+        }, 'users-create|users-update', 'TeamA', 'guard:api|web,require_all'));
     }
 
     public function testHandle_IsLoggedInWithNoPermission_ShouldRedirectWithError()

tests/Middleware/MiddlewareLaratrustAbilityTest.php

@@ -184,18 +184,18 @@ public function testHandle_IsLoggedInWithAbilityAndMultipleGuards_ShouldNotAbort
         }, 'admin|user', 'edit-users|update-users'));
 
         $this->assertNull($middleware->handle($this->request, function () {
-        }, 'admin|user', 'edit-users|update-users', 'guard:api|guard:web'));
+        }, 'admin|user', 'edit-users|update-users', 'guard:api|web'));
 
         $this->assertNull($middleware->handle($this->request, function () {
         }, 'admin|user', 'edit-users|update-users', 'require_all'));
 
         $this->assertNull($middleware->handle($this->request, function () {
-        }, 'admin|user', 'edit-users|update-users', 'guard:api|guard:web|require_all'));
+        }, 'admin|user', 'edit-users|update-users', 'require_all,guard:api|web'));
 
         $this->assertNull($middleware->handle($this->request, function () {
         }, 'admin|user', 'edit-users|update-users', 'TeamA', 'require_all'));
 
         $this->assertNull($middleware->handle($this->request, function () {
-        }, 'admin|user', 'edit-users|update-users', 'TeamA', 'require_all|guard:api|guard:web'));
+        }, 'admin|user', 'edit-users|update-users', 'TeamA', 'require_all,guard:api|web'));
     }
 }