Merge pull request #12607 from dynasource/12592-improve-performance-accesscontrol

enhance performance by ignoring rules that are never used #12592

framework/CHANGELOG.md

@@ -3,7 +3,7 @@ Yii Framework 2 Change Log
 
 2.1.0 under development
 -----------------------
-
+- Enh #12592: Optimized `yii\filters\AccessController` on processing accessrules (dynasource)
 - Removed methods marked as deprected in 2.0.x (samdark)
 - Chg #10771: Consistent behavior of `run()` method in all framework widgets. All return the result now for better extensibility (pkirill99, cebe)
 - Chg #11397: Minimum required version of PHP is 5.5.0 now (samdark)

framework/UPGRADE.md

@@ -34,6 +34,9 @@ Upgrade to Yii 2.1.0
   `yii\db\QueryBuilderbuild::buildOrderByAndLimit($sql, $orderBy, $limit, $offset)` -> `buildOrderByAndLimit($sql, $orderBy, $limit, $offset, &$params)`
   `yii\widgets\ActiveField::hint($content = null, $options = [])`
 
+* `yii\filters\AccessControl` has been optimized by only instantiating rules at the moment of use. 
+   This could lead to a potential BC-break if you are depending on $rules to be instantiated in init().
+
 Upgrade from Yii 2.0.8
 ----------------------
 

framework/filters/AccessControl.php

@@ -11,8 +11,8 @@ use Yii;
 use yii\base\Action;
 use yii\base\ActionFilter;
 use yii\di\Instance;
-use yii\web\User;
 use yii\web\ForbiddenHttpException;
+use yii\web\User;
 
 /**
  * AccessControl provides simple access control based on a set of rules.
@@ -88,21 +88,6 @@ class AccessControl extends ActionFilter
      */
     public $rules = [];
 
-
-    /**
-     * Initializes the [[rules]] array by instantiating rule objects from configurations.
-     */
-    public function init()
-    {
-        parent::init();
-        $this->user = Instance::ensure($this->user, User::class);
-        foreach ($this->rules as $i => $rule) {
-            if (is_array($rule)) {
-                $this->rules[$i] = Yii::createObject(array_merge($this->ruleConfig, $rule));
-            }
-        }
-    }
-
     /**
      * This method is invoked right before an action is to be executed (after all possible filters.)
      * You may override this method to do last-minute preparation for the action.
@@ -111,10 +96,13 @@ class AccessControl extends ActionFilter
      */
     public function beforeAction($action)
     {
-        $user = $this->user;
+        $user = $this->user = Instance::ensure($this->user, User::class);
         $request = Yii::$app->getRequest();
         /* @var $rule AccessRule */
-        foreach ($this->rules as $rule) {
+        foreach ($this->rules as $key => $rule) {
+            if (!is_object($rule)) {
+                $rule = $this->rules[$key] = Yii::createObject(array_merge($this->ruleConfig, $rule));
+            }
             if ($allow = $rule->allows($action, $user, $request)) {
                 return true;
             } elseif ($allow === false) {