Merge branch 'master' of git.yiisoft.com:yii2

Conflicts:
	framework/base/Application.php

framework/base/Application.php

@@ -216,11 +216,10 @@ class Application extends Module
 		if ($result === false) {
 			throw new InvalidRequestException(Yii::t('yii', 'Unable to resolve the request.'));
 		}
-		/** @var $controller Controller */
-		list($controller, $action) = $result;
+
 		$priorController = $this->controller;
-		$this->controller = $controller;
-		$status = $controller->run($action, $params);
+		$this->controller = $controllerObject;
+		$status = $controllerObject->run($action, $params);
 		$this->controller = $priorController;
 		return $status;
 	}

framework/base/Controller.php

@@ -142,8 +142,9 @@ class Controller extends Component
 		if ($actionID === '') {
 			$actionID = $this->defaultAction;
 		}
-		if (isset($this->actionMap[$actionID])) {
-			return \Yii::createObject($this->actionMap[$actionID], $actionID, $this);
+		$actions = $this->actions();
+		if (isset($actions[$actionID])) {
+			return \Yii::createObject($actions[$actionID], $actionID, $this);
 		} elseif (method_exists($this, 'action' . $actionID)) {
 			return new InlineAction($actionID, $this);
 		} else {