- Fixed domains not being prepending properly to urls.

- Won't prepend subdomain to urls if subdomain is equal to current host.
- Url: implemented parse function.
- Router: getUrl now parses url to properly parse the subdomain.

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -6,6 +6,7 @@ use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\Exceptions\HttpException;
 use Pecee\SimpleRouter\Router;
+use Pecee\SimpleRouter\SimpleRouter;
 
 abstract class LoadableRoute extends Route implements ILoadableRoute
 {
@@ -138,12 +139,6 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     {
         $url = $this->getUrl();
 
-        $group = $this->getGroup();
-
-        if ($group !== null && count($group->getDomains()) !== 0) {
-            $url = '//' . $group->getDomains()[0] . $url;
-        }
-
         /* Create the param string - {parameter} */
         $param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];
 
@@ -177,7 +172,15 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
             }
         }
 
-        return rtrim('/' . ltrim($url, '/'), '/') . '/';
+        $url = rtrim('/' . ltrim($url, '/'), '/') . '/';
+
+        $group = $this->getGroup();
+
+        if ($group !== null && count($group->getDomains()) !== 0 && SimpleRouter::request()->getHost() !== $group->getDomains()[0]) {
+            $url = '//' . $group->getDomains()[0] . $url;
+        }
+
+        return $url;
     }
 
     /**

src/Pecee/SimpleRouter/Route/RouteController.php

@@ -3,6 +3,7 @@
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\SimpleRouter;
 
 class RouteController extends LoadableRoute implements IControllerRoute
 {
@@ -77,13 +78,15 @@ class RouteController extends LoadableRoute implements IControllerRoute
 
         $group = $this->getGroup();
 
-        if ($group !== null && count($group->getDomains()) !== 0) {
-            $url .= '//' . $group->getDomains()[0];
-        }
-
         $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower((string)$method) . implode('/', $parameters);
 
-        return '/' . trim($url, '/') . '/';
+        $url = '/' . trim($url, '/') . '/';
+
+        if ($group !== null && count($group->getDomains()) !== 0 && SimpleRouter::request()->getHost() !== $group->getDomains()[0]) {
+            $url = '//' . $group->getDomains()[0] . $url;
+        }
+
+        return $url;
     }
 
     public function matchRoute(string $url, Request $request): bool

src/Pecee/SimpleRouter/Route/RouteGroup.php

@@ -220,7 +220,7 @@ class RouteGroup extends Route implements IGroupRoute
             $this->setExceptionHandlers((array)$settings['exceptionHandler']);
         }
 
-        if ($merge === false && isset($settings['domain']) === true) {
+        if (isset($settings['domain']) === true) {
             $this->setDomains((array)$settings['domain']);
         }
 

src/Pecee/SimpleRouter/Route/RouteResource.php

@@ -3,6 +3,7 @@
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\SimpleRouter;
 
 class RouteResource extends LoadableRoute implements IControllerRoute
 {
@@ -80,7 +81,14 @@ class RouteResource extends LoadableRoute implements IControllerRoute
             return rtrim($this->url . $parametersUrl . $this->urls[$url], '/') . '/';
         }
 
-        return $this->url . $parametersUrl;
+        $url = $this->url . $parametersUrl;
+
+        $group = $this->getGroup();
+        if ($group !== null && count($group->getDomains()) !== 0 && SimpleRouter::request()->getHost() !== $group->getDomains()[0]) {
+            $url = '//' . $group->getDomains()[0] . $url;
+        }
+
+        return $url;
     }
 
     protected function call($method): bool