Refactoring.

Removed ControllerContext.
ActionContext now is base class for ActionExecutingContext, ActionExecutedContext and ExceptionContext.

Author: meet-aleksey

src/ActionContext.php

@@ -58,13 +58,24 @@ class ActionContext {
     /**
      * Initializes a new instance of the ActionContext for the current request.
      * 
-     * @param HttpContextBase $httpContext Context of the request.
+     * @param HttpContextBase|ActionContext $httpContext Context of the request.
      */
     public function __construct($httpContext) {
-        $this->httpContext = $httpContext;
-        $this->route = $httpContext->getRoute();
-        $this->modelState = new ModelState();
-        $this->filters = array();
+        if ($httpContext instanceof ActionContext) {
+            $this->httpContext = $httpContext->getHttpContext();
+            $this->route = $httpContext->getRoute();
+            $this->modelState = $httpContext->getModelState();
+            $this->filters = $httpContext->getFilters();
+            $this->actionName = $httpContext->getActionName();
+            $this->arguments = $httpContext->getArguments();
+            $this->controller = $httpContext->getController();
+        }
+        else {
+            $this->httpContext = $httpContext;
+            $this->route = $httpContext->getRoute();
+            $this->modelState = new ModelState();
+            $this->filters = array();
+        }
     }
 
     /**

src/ActionExecutedContext.php

@@ -4,7 +4,7 @@
 /**
  * Provides the context for the actionExecuted method of the ActionFilter class.
  */
-final class ActionExecutedContext extends ControllerContext {
+final class ActionExecutedContext extends ActionContext {
 
     /**
      * Gets or sets the result that is returned by the action method.
@@ -30,12 +30,12 @@ final class ActionExecutedContext extends ControllerContext {
     /**
      * Initializes a new instance of the ActionExecutedContext.
      * 
-     * @param Controller $controller An instance of the controller.
+     * @param ActionContext $actionContext The context of the action.
      * @param ActionResult $result The action result.
      * @param exceptionContext $exceptionContext The context of exception, if there was an exception.
      */
-    public function __construct($controller, $result, $exceptionContext) {
-        parent::__construct($controller);
+    public function __construct($actionContext, $result, $exceptionContext) {
+        parent::__construct($actionContext);
 
         $this->result = $result;
 

src/ActionExecutingContext.php

@@ -4,7 +4,7 @@
 /**
  * Provides the context for the actionExecuting method of the ActionFilter class.
  */
-final class ActionExecutingContext extends ControllerContext {
+final class ActionExecutingContext extends ActionContext {
 
     /**
      * Gets or sets the result that is returned by the action method.
@@ -16,10 +16,10 @@ final class ActionExecutingContext extends ControllerContext {
     /**
      * Initializes a new instance of the ActionExecutingContext.
      * 
-     * @param Controller $controller An instance of the controller.
+     * @param ActionContext $actionContext The context of the action.
      */
-    public function __construct($controller) {
-        parent::__construct($controller);
+    public function __construct($actionContext) {
+        parent::__construct($actionContext);
     }
 
     /**

src/ControllerContext.php

@@ -4,7 +4,7 @@
 /**
  * Provides the context for the exception() method of the ActionFilter class.
  */
-final class ExceptionContext extends ControllerContext {
+final class ExceptionContext extends ActionContext {
 
     /**
      * Gets or sets the result that is returned by the action method.

src/ExceptionContext.php

@@ -25,16 +25,16 @@ public function end() {
             $GLOBALS['http_response_code'] = $statusCode;
         }
 
-        // headers
-        foreach ($this->headers as $name => $value) {
-            header($name . ': ' . $value);
-        }
-
         // cookies
         foreach ($this->cookies as $cookie) {
             call_user_func_array('setcookie', $cookie);
         }
 
+        // headers
+        foreach ($this->headers as $name => $value) {
+            header($name . ': ' . $value);
+        }
+
         // files
         foreach ($this->files as $file) {
             $fp = fopen($file, 'rb');

src/HttpResponse.php

@@ -592,7 +592,7 @@ private static function executeAction($actionContext) {
      * @return ActionExecutingContext
      */
     private static function actionExecutingFilters($actionContext) {
-        $context = new ActionExecutingContext($actionContext->getController());
+        $context = new ActionExecutingContext($actionContext);
 
         $filters = $actionContext->getFilters();
 
@@ -613,7 +613,7 @@ private static function actionExecutingFilters($actionContext) {
      * @return ActionExecutedContext
      */
     private static function actionExecutedFilters($actionContext, $actionResult, $exceptionContext = null) {
-        $context = new ActionExecutedContext($actionContext->getController(), $actionResult, $exceptionContext);
+        $context = new ActionExecutedContext($actionContext, $actionResult, $exceptionContext);
 
         $filters = $actionContext->getFilters();
 
@@ -633,7 +633,7 @@ private static function actionExecutedFilters($actionContext, $actionResult, $ex
      * @return ExceptionContext
      */
     private static function exceptionFilters($actionContext, $exception) {
-        $context = new ExceptionContext($actionContext->getController(), $exception);
+        $context = new ExceptionContext($actionContext, $exception);
 
         $filters = $actionContext->getFilters();