Added current HttpContext.

serverVariables renamed to server.

Author: meet-aleksey

src/HttpContext.php

@@ -6,6 +6,13 @@
  */
 final class HttpContext extends HttpContextBase {
 
+    /**
+     * Gets or sets current HttpContext.
+     * 
+     * @var HttpContextBase
+     */
+    private static $current;
+
     /**
      * Initializes a new instance of the HttpContext for the current request.
      */
@@ -15,5 +22,14 @@ public function __construct() {
 
         parent::__construct($routes, $ignored, new HttpRequest(), new HttpResponse());
     }
-    
+
+    /**
+     * Returs current HttpContext.
+     * 
+     * @return HttpContextBase
+     */
+    public static function getCurrent() {
+        return self::$current;
+    }
+
 }

src/HttpRequestBase.php

@@ -205,7 +205,7 @@ public function documentRoot() {
      * 
      * @return array|string
      */
-    public function serverVariables($key = null) {
+    public function server($key = null) {
         return $this->getSingleKeyOrAll($this->serverVariables, $key);
     }
 

src/Make.php

@@ -88,6 +88,8 @@ private static function httpContext($httpContext = null) {
             $httpContext = new HttpContext();
         }
 
+        InternalHelper::setStaticPropertyValue('\\PhpMvc\\HttpContext', 'current', $httpContext);
+
         return $httpContext;
     }
 

src/UrlHelper.php

@@ -38,7 +38,7 @@ public static function action($actionContext, $actionName, $controllerName = nul
             $result .= $schema . '://';
 
             if (empty($host)) {
-                $result .= $httpContext->getRequest()->serverVariables('HTTP_HOST') . '/';
+                $result .= $httpContext->getRequest()->server('HTTP_HOST') . '/';
             }
         }