Added first slash.

Implemented Html::action()

Author: meet-aleksey

src/Html.php

@@ -158,22 +158,17 @@ public static function view($path, $model = null) {
     /**
      * Returns the path to action.
      * 
+     * @param string $actionName The name of the action.
+     * @param string $controllerName The name of the controller. Default: current controller.
+     * @param array $routeValues An array that contains the parameters for a route.
+     * @param string $fragment The URL fragment name (the anchor name).
+     * @param string $schema The protocol for the URL, such as "http" or "https".
+     * @param string $host The host name for the URL.
+     * 
      * @return string
      */
-    public static function action($actionName, $controllerName = null) {
-        $params = '';
-
-        if (empty($controllerName)) {
-            $controllerName = PHPMVC_VIEW;
-        }
-        elseif (is_array($controllerName)) {
-            $params = '&' . http_build_query($controllerName);
-            $controllerName = PHPMVC_VIEW;
-        }
-
-        // TODO: url mode
-        return '/?controller=' . $controllerName . '&action=' . $actionName . $params;
-        // return '/' . $controllerName . '/' . $actionName;
+    public static function action($actionName, $controllerName = null, $routeValues = null, $fragment = null, $schema = null, $host = null) {
+        return UrlHelper::action(self::$viewContext, $actionName, $controllerName, $routeValues, $fragment, $schema, $host);
     }
 
     /**

src/UrlHelper.php

@@ -58,6 +58,10 @@ public static function action($actionContext, $actionName, $controllerName = nul
             $result .= $host . '/';
         }
 
+        if (empty($result)) {
+            $result = '/';
+        }
+
         $routeValues = isset($routeValues) ? $routeValues : array();
 
         if (empty($controllerName)) {

tests/MakeTest.php

@@ -483,6 +483,11 @@ public function testLoginGet() {
             $result
         );
 
+        $this->assertContains(
+            '<form id="loginForm" action="/account/login" method="post" enctype="application/x-www-form-urlencoded">',
+            $result
+        );
+
         $this->assertContains(
             '<label for="login">Username:</label>',
             $result
@@ -503,6 +508,11 @@ public function testLoginGet() {
             $result
         );
 
+        $this->assertContains(
+            '<a href="/home" class="btn btn-default">Cancel</a>',
+            $result
+        );
+
         $this->assertContains(
             '<footer>',
             $result

tests/UrlHelperTest.php

@@ -55,7 +55,7 @@ public function testAction(): void
         $actionContext = new ActionContext($httpContext);
 
         $this->assertEquals(
-            'test/abc/aaa/bbbbb/ffff',
+            '/test/abc/aaa/bbbbb/ffff',
             $result = UrlHelper::action($actionContext, 'bbbbb')
         );
 
@@ -74,7 +74,7 @@ public function testAction(): void
         $actionContext = new ActionContext($httpContext);
 
         $this->assertEquals(
-            'test',
+            '/test',
             $result = UrlHelper::action($actionContext, 'index')
         );
 
@@ -102,7 +102,7 @@ public function testAction(): void
         echo $result . ' - OK' . chr(10);
 
         $this->assertEquals(
-            'test/page/123?text=hello+world%21&n=555',
+            '/test/page/123?text=hello+world%21&n=555',
             $result = UrlHelper::action(
                 $actionContext, 
                 'page', 
@@ -118,14 +118,14 @@ public function testAction(): void
         echo $result . ' - OK' . chr(10);
 
         $this->assertEquals(
-            'testovich',
+            '/testovich',
             $result = UrlHelper::action($actionContext, 'index', 'abc')
         );
 
         echo $result . ' - OK' . chr(10);
 
         $this->assertEquals(
-            'testovich/examplovich', 
+            '/testovich/examplovich', 
             $result = UrlHelper::action($actionContext, 'examplovich', 'abc')
         );