mirror of
				https://github.com/yiisoft/yii2.git
				synced 2025-11-04 22:57:40 +08:00 
			
		
		
		
	Better executeRule implementation.
This commit is contained in:
		@ -9,6 +9,7 @@ namespace yii\rbac;
 | 
			
		||||
 | 
			
		||||
use Yii;
 | 
			
		||||
use yii\base\Component;
 | 
			
		||||
use yii\base\InvalidConfigException;
 | 
			
		||||
use yii\base\InvalidParamException;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
@ -145,17 +146,22 @@ abstract class Manager extends Component
 | 
			
		||||
     * @param string $ruleName name of the rule to be executed.
 | 
			
		||||
     * @param array $params parameters passed to [[Manager::checkAccess()]].
 | 
			
		||||
     * @param mixed $data additional data associated with the authorization item or assignment.
 | 
			
		||||
     * @return boolean whether the rule execution returns true.
 | 
			
		||||
     * If the rule is empty, it will still return true.
 | 
			
		||||
     * @return boolean whether the rule execution returns true. If `$ruleName` is null, true will be returned.
 | 
			
		||||
     * @throws InvalidConfigException if `$ruleName` does not correspond to a valid rule.
 | 
			
		||||
     */
 | 
			
		||||
    public function executeRule($ruleName, $params, $data)
 | 
			
		||||
    {
 | 
			
		||||
        if ($ruleName !== null) {
 | 
			
		||||
            $rule = $this->getRule($ruleName);
 | 
			
		||||
        if ($rule) {
 | 
			
		||||
            if ($rule instanceof Rule) {
 | 
			
		||||
                return $rule->execute($params, $data);
 | 
			
		||||
            } else {
 | 
			
		||||
                throw new InvalidConfigException("Rule not found: $ruleName");
 | 
			
		||||
            }
 | 
			
		||||
        } else {
 | 
			
		||||
            return true;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Checks the item types to make sure a child can be added to a parent.
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user