Fixed minor issues in the router class

- Added missing UrlGeneratorInterface to the router class.
- Updated the getCollection method to no longer throw an exception
- Improved performance of the addRoute method in the router's class

src/Router.php

@@ -31,7 +31,7 @@
  *
  * @author Divine Niiquaye Ibok <[email protected]>
  */
-class Router implements RouteMatcherInterface, RequestMethodInterface, MiddlewareInterface
+class Router implements RouteMatcherInterface, RequestMethodInterface, MiddlewareInterface, UrlGeneratorInterface
 {
     /**
      * Standard HTTP methods for browser requests.
@@ -90,9 +90,7 @@ public static function withCollection(RouteCollection $collection = null, RouteC
      */
     public function addRoute(Route ...$routes): void
     {
-        if ($this->collection instanceof RouteCollection) {
-            $this->collection->routes($routes);
-        }
+        $this->getCollection()->routes($routes, false);
     }
 
     /**
@@ -118,11 +116,9 @@ public function generateUri(string $routeName, array $parameters = [], int $refe
     {
         $matcher = $this->getMatcher();
 
-        //@codeCoverageIgnoreStart
         if (!$matcher instanceof UrlGeneratorInterface) {
             throw new UrlGenerationException(\sprintf('The route matcher does not support using the %s implementation', UrlGeneratorInterface::class));
         }
-        //@codeCoverageIgnoreEnd
 
         return $matcher->generateUri($routeName, $parameters, $referenceType);
     }
@@ -166,11 +162,11 @@ public function getCollection(): RouteCollection
     {
         if (\is_callable($collection = $this->collection)) {
             $collection($collection = new RouteCollection());
-        } elseif (null === $collection) {
-            throw new \RuntimeException(\sprintf('Did you forget to set add the route collection with the "%s".', __CLASS__ . '::setCollection'));
+        } elseif (null !== $collection) {
+            return $this->collection;
         }
 
-        return $this->collection = $collection;
+        return $this->collection = $collection ?? new RouteCollection();
     }
 
     /**

tests/RouterTest.php

@@ -26,8 +26,11 @@
 use Flight\Routing\Generator\GeneratedUri;
 use Flight\Routing\Handlers\ResourceHandler;
 use Flight\Routing\Handlers\RouteHandler;
+use Flight\Routing\Interfaces\RouteMatcherInterface;
+use Flight\Routing\Interfaces\UrlGeneratorInterface;
 use Flight\Routing\Route;
 use Flight\Routing\RouteCollection;
+use Flight\Routing\RouteMatcher;
 use Flight\Routing\Router;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Nyholm\Psr7\Response;
@@ -49,11 +52,10 @@ public function testConstructor(): void
     {
         $router = new Router();
         $this->assertInstanceOf(MiddlewareInterface::class, $router);
+        $this->assertInstanceOf(UrlGeneratorInterface::class, $router);
+        $this->assertInstanceOf(RouteMatcherInterface::class, $router);
 
-        $this->expectExceptionMessage('Did you forget to set add the route collection with the "Flight\Routing\Router::setCollection".');
-        $this->expectException(\RuntimeException::class);
-
-        $router->getMatcher();
+        $this->assertInstanceOf(RouteMatcher::class, $router->getMatcher());
     }
 
     public function testAddRoute(): void
@@ -419,7 +421,7 @@ public function testHandleRouteHandlerAsResponse(): void
         $route = new Route('/foo');
         $route->run(new Response(200, ['Response' => 'Controller']));
 
-        $router = Router::withCollection();
+        $router = new Router();
         $router->addRoute($route);
         $response = $router->process(new ServerRequest($route->getMethods()[0], $route->getPath()), new RouteHandler(new Psr17Factory()));