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

Better executeRule implementation.

Browse Source
This commit is contained in:
Qiang Xue
2014-04-07 19:59:48 -04:00
parent a16c2eb653
commit f46b51eaf4
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
framework/rbac/Manager.php
View File

@ -9,6 +9,7 @@ namespace yii\rbac;
use Yii; use Yii;
use yii\base\Component; use yii\base\Component;
use yii\base\InvalidConfigException;
use yii\base\InvalidParamException; use yii\base\InvalidParamException;
/** /**
@ -145,16 +146,21 @@ abstract class Manager extends Component
* @param string $ruleName name of the rule to be executed. * @param string $ruleName name of the rule to be executed.
* @param array $params parameters passed to [[Manager::checkAccess()]]. * @param array $params parameters passed to [[Manager::checkAccess()]].
* @param mixed $data additional data associated with the authorization item or assignment. * @param mixed $data additional data associated with the authorization item or assignment.
* @return boolean whether the rule execution returns true. * @return boolean whether the rule execution returns true. If `$ruleName` is null, true will be returned.
* If the rule is empty, it will still return true. * @throws InvalidConfigException if `$ruleName` does not correspond to a valid rule.
*/ */
public function executeRule($ruleName, $params, $data) public function executeRule($ruleName, $params, $data)
{ {
$rule = $this->getRule($ruleName); if ($ruleName !== null) {
if ($rule) { $rule = $this->getRule($ruleName);
return $rule->execute($params, $data); if ($rule instanceof Rule) {
return $rule->execute($params, $data);
} else {
throw new InvalidConfigException("Rule not found: $ruleName");
}
} else {
return true;
} }
return true;
} }
/** /**