From 7cb13457f273423fd2db5102a6eafeca46600f25 Mon Sep 17 00:00:00 2001 From: Kartik Visweswaran Date: Fri, 13 Oct 2017 23:30:03 +0530 Subject: [PATCH] Update AccessRuleFilter to evaluate roleParams The `roleParams` was not being evaluated earlier and has been included. --- src/User/Filter/AccessRuleFilter.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/User/Filter/AccessRuleFilter.php b/src/User/Filter/AccessRuleFilter.php index 72ee1cb..9d11310 100644 --- a/src/User/Filter/AccessRuleFilter.php +++ b/src/User/Filter/AccessRuleFilter.php @@ -41,8 +41,13 @@ class AccessRuleFilter extends AccessRule if (!$user->getIsGuest() && $identity->getIsAdmin()) { return true; } - } elseif ($user->can($role)) { - return true; + } else { + if (!isset($roleParams)) { + $roleParams = $this->roleParams instanceof Closure ? call_user_func($this->roleParams, $this) : $this->roleParams; + } + if ($user->can($role, $roleParams)) { + return true; + } } }