php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-04 06:37:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #17341: Allow callable objects to be set to \yii\filters\AccessRule::$roleParams

Browse Source
This commit is contained in:
Alexander Kartavenko
2019-06-12 00:02:07 +03:00
committed by Alexander Makarov
parent 0165416c79
commit a226b76776
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -9,6 +9,7 @@ Yii Framework 2 Change Log
- Enh #17345: Improved performance of `yii\db\Connection::quoteColumnName()` (brandonkelly)
- Enh #17348: Improved performance of `yii\db\Connection::quoteTableName()` (brandonkelly)
- Enh #17353: Added `sameSite` support for `yii\web\Cookie` and `yii\web\Session::cookieParams` (rhertogh)
- Bug #17341: Allow callable objects to be set to `\yii\filters\AccessRule::$roleParams` (alexkart)
2.0.20 June 04, 2019

2
framework/filters/AccessRule.php
View File

@ -240,7 +240,7 @@ class AccessRule extends Component
}
} else {
if (!isset($roleParams)) {
$roleParams = $this->roleParams instanceof Closure ? call_user_func($this->roleParams, $this) : $this->roleParams;
$roleParams = !is_array($this->roleParams) && is_callable($this->roleParams) ? call_user_func($this->roleParams, $this) : $this->roleParams;
}
if ($user->can($item, $roleParams)) {
return true;

32
tests/framework/filters/AccessRuleTest.php
View File

@ -363,6 +363,30 @@ class AccessRuleTest extends \yiiunit\TestCase
$this->assertTrue($rule->allows($action, $user, $request));
}
/**
* Test that callable object can be used as roleParams values
*/
public function testMatchRoleWithRoleParamsCallable()
{
$action = $this->mockAction();
$action->id = 'update';
$auth = $this->mockAuthManager();
$request = $this->mockRequest();
$rule = new AccessRule([
'allow' => true,
'roles' => ['updatePost'],
'actions' => ['update'],
'roleParams' => new RoleParamCallableObject(),
]);
$user = $this->mockUser('user2');
$user->accessChecker = $auth;
$this->assertEquals(true, $rule->allows($action, $user, $request));
}
public function testMatchVerb()
{
$action = $this->mockAction();
@ -566,3 +590,11 @@ class AccessRuleTest extends \yiiunit\TestCase
$this->assertNull($rule->allows($action, $user, $request));
}
}
class RoleParamCallableObject
{
public function __invoke()
{
return ['authorID' => 'user2'];
}
}