code improved

Author: fenric

src/Router.php

@@ -246,12 +246,8 @@ public function match(ServerRequestInterface $request) : RouteInterface
         $allowedMethods = [];
 
         foreach ($this->routes as $route) {
-            $routeHost = $route->getHost();
-            if (isset($routeHost)) {
-                $routeHost = $this->hosts[$routeHost] ?? $routeHost;
-                if ($routeHost <> $requestHost) {
-                    continue;
-                }
+            if (!$this->compareHosts($route->getHost(), $requestHost)) {
+                continue;
             }
 
             // https://github.com/sunrise-php/http-router/issues/50
@@ -300,9 +296,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         try {
             return $this->handle($request);
         } catch (MethodNotAllowedException | RouteNotFoundException $e) {
-            return $handler->handle(
-                $request->withAttribute(self::ATTR_NAME_FOR_ROUTING_ERROR, $e)
-            );
+            $request = $request->withAttribute(self::ATTR_NAME_FOR_ROUTING_ERROR, $e);
+
+            return $handler->handle($request);
         }
     }
 
@@ -319,4 +315,34 @@ public function load(LoaderInterface ...$loaders) : void
             $this->addRoute(...$loader->load()->all());
         }
     }
+
+    /**
+     * Compares the given route host and the given request host
+     *
+     * Returns `true` if the route host is `null`
+     * or if the route host is equal to the request host,
+     * otherwise returns `false`.
+     *
+     * @param null|string $routeHost
+     * @param string $requestHost
+     *
+     * @return bool
+     */
+    private function compareHosts(?string $routeHost, string $requestHost) : bool
+    {
+        if (null === $routeHost) {
+            return true;
+        }
+
+        // trying to resolve the route host....
+        if (isset($this->hosts[$routeHost])) {
+            $routeHost = $this->hosts[$routeHost];
+        }
+
+        if ($requestHost === $routeHost) {
+            return true;
+        }
+
+        return false;
+    }
 }