Merge pull request #3499 from ShNURoK42/master

framework/web/Controller.php

@@ -105,7 +105,7 @@ class Controller extends \yii\base\Controller
     public function beforeAction($action)
     {
         if (parent::beforeAction($action)) {
-            if ($this->enableCsrfValidation && Yii::$app->errorHandler->exception === null && !Yii::$app->getRequest()->validateCsrfToken()) {
+            if ($this->enableCsrfValidation && Yii::$app->getErrorHandler()->exception === null && !Yii::$app->getRequest()->validateCsrfToken()) {
                 throw new BadRequestHttpException(Yii::t('yii', 'Unable to verify your data submission.'));
             }
             return true;

framework/web/ErrorAction.php

@@ -68,7 +68,7 @@ class ErrorAction extends Action
 
     public function run()
     {
-        if (($exception = Yii::$app->errorHandler->exception) === null) {
+        if (($exception = Yii::$app->getErrorHandler()->exception) === null) {
             return '';
         }