Restore guard:api|guard:web syntax.

Author: derekrprice

src/Middleware/LaratrustMiddleware.php

@@ -2,6 +2,7 @@
 
 namespace Laratrust\Middleware;
 
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
@@ -90,10 +91,12 @@ protected function assignRealValuesTo($team, $options)
      */
     protected function extractGuards($string)
     {
-        return preg_match("/\\bguard:((?:[^|,]+)(?:[|][^|,]+)*)\b/", $string, $matches)
-            ? Collection::make(explode("|", $matches[1]))->reject(function ($value, $key) {
-                return $value == "require_all";
-            })
-            : [];
+        $options = Collection::make(explode('|', $string));
+
+        return $options->reject(function ($option) {
+            return strpos($option, 'guard:') === false;
+        })->map(function ($option) {
+            return explode(':', $option)[1];
+        })->toArray();
     }
 }

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|web'));
+        }, 'users-create|users-update', 'guard:api|guard: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|web,require_all'));
+        }, 'users-create|users-update', 'guard:api|guard: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|web,require_all'));
+        }, 'users-create|users-update', 'TeamA', 'guard:api|guard: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|web'));
+        }, 'admin|user', 'edit-users|update-users', 'guard:api|guard: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', 'require_all,guard:api|web'));
+        }, 'admin|user', 'edit-users|update-users', 'require_all|guard:api|guard: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|web'));
+        }, 'admin|user', 'edit-users|update-users', 'TeamA', 'require_all|guard:api|guard:web'));
     }
 }