Refactor new code

lonnieezell · Jul 12, 2022 · e69eb05 · e69eb05
1 parent 61b2fd1
commit e69eb05
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/src/AuthTrait.php b/src/AuthTrait.php
@@ -116,8 +116,8 @@ public function restrictToGroups($groups, $uri = null)
      * the user to the URI set in $url or the site root, and attempt
      * to set a status message.
      *
-     * @param        $permissions
-     * @param string $uri         The URI to redirect to on fail.
+     * @param int|int[]|string|string[] $permissions
+     * @param string                    $uri         The URI to redirect to on fail.
      *
      * @throws RedirectException
      *
@@ -127,23 +127,13 @@ public function restrictWithPermissions($permissions, $uri = null)
     {
         $this->setupAuthClasses();
 
-        if ($this->authenticate->check())
-        {
-            if (is_array($permissions))
-            {
-                foreach ($permissions as $permission)
-                {
-                    if ($this->authorize->hasPermission($permission, $this->authenticate->id())
-                    {
-                        return true;
-                    }
-                }
-
+        if ($this->authenticate->check()) {
+            if (! is_array($permissions)) {
+                $permissions = [$permissions];
             }
-            else
-            {
-                if ($this->authorize->hasPermission($permissions, $this->authenticate->id() ) )
-                {
+
+            foreach ($permissions as $permission) {
+                if ($this->authorize->hasPermission($permission, $this->authenticate->id())) {
                     return true;
                 }
             }