add url generator class

Author: Fady Michel

src/Helper.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace DevCoder;
+
+class Helper
+{
+    public static function trimPath(string $path): string
+    {
+        return '/' . rtrim(ltrim(trim($path), '/'), '/');
+    }
+}

src/Route.php

@@ -65,7 +65,7 @@ public function match(string $path, string $method): bool
             $regex = str_replace($variable, '(?P<' . $varName . '>[^/]++)', $regex);
         }
 
-        if (in_array($method, $this->getMethods()) && preg_match('#^' . $regex . '$#sD', self::trimPath($path), $matches)) {
+        if (in_array($method, $this->getMethods()) && preg_match('#^' . $regex . '$#sD', Helper::trimPath($path), $matches)) {
             $values = array_filter($matches, static function ($key) {
                 return is_string($key);
             }, ARRAY_FILTER_USE_KEY);
@@ -112,9 +112,4 @@ public function getVars(): array
     {
         return $this->vars;
     }
-
-    private static function trimPath(string $path): string
-    {
-        return '/' . rtrim(ltrim(trim($path), '/'), '/');
-    }
 }

src/Router.php

@@ -12,26 +12,28 @@ final class Router implements RouterInterface
     private const NO_ROUTE = 404;
 
     /**
-     * @var array<Route>
+     * @var \ArrayIterator<Route>
      */
-    private $routes = [];
+    private $routes;
+
+    /**
+     * @var UrlGenerator
+     */
+    private $urlGenerator;
 
     /**
      * Router constructor.
      * @param $routes array<Route>
      */
     public function __construct(array $routes = [])
     {
-        foreach ($routes as $route) {
-            $this->add($route);
-        }
+        $this->routes = new \ArrayIterator(array_unique($routes));
+        $this->urlGenerator = new UrlGenerator($this->routes);
     }
 
     public function add(Route $route): self
     {
-        if (in_array($route, $this->routes) === false) {
-            $this->routes[$route->getName()] = $route;
-        }
+        $this->routes->offsetSet($route->getName(), $route);
         return $this;
     }
 
@@ -57,32 +59,6 @@ public function matchFromPath(string $path, string $method): Route
 
     public function generateUri(string $name, array $parameters = []): string
     {
-        if (array_key_exists($name, $this->routes) === false) {
-            throw new \InvalidArgumentException(
-                sprintf('Unknown %s name route', $name)
-            );
-        }
-        $route = $this->routes[$name];
-        if ($route->hasVars() && $parameters === []) {
-            throw new \InvalidArgumentException(
-                sprintf('%s route need parameters: %s', $name, implode(',', $route->getVarsNames()))
-            );
-        }
-        return self::resolveUri($route, $parameters);
-    }
-
-    private static function resolveUri(Route $route, array $parameters): string
-    {
-        $uri = $route->getPath();
-        foreach ($route->getVarsNames() as $variable) {
-            $varName = trim($variable, '{\}');
-            if (array_key_exists($varName, $parameters) === false) {
-                throw new \InvalidArgumentException(
-                    sprintf('%s not found in parameters to generate url', $varName)
-                );
-            }
-            $uri = str_replace($variable, $parameters[$varName], $uri);
-        }
-        return $uri;
+        return $this->urlGenerator->generate($name, $parameters);
     }
 }

src/UrlGenerator.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DevCoder;
+
+final class UrlGenerator
+{
+    /**
+     * @var \ArrayIterator<Route>
+     */
+    private $routes;
+
+    public function __construct(\ArrayIterator $routes)
+    {
+        $this->routes = $routes;
+    }
+
+    public function generate(string $name, array $parameters = []): string
+    {
+        if (array_key_exists($name, $this->routes) === false) {
+            throw new \InvalidArgumentException(
+                sprintf('Unknown %s name route', $name)
+            );
+        }
+        $route = $this->routes[$name];
+        if ($route->hasVars() && $parameters === []) {
+            throw new \InvalidArgumentException(
+                sprintf('%s route need parameters: %s', $name, implode(',', $route->getVarsNames()))
+            );
+        }
+        return self::resolveUri($route, $parameters);
+    }
+
+    private static function resolveUri(Route $route, array $parameters): string
+    {
+        $uri = $route->getPath();
+        foreach ($route->getVarsNames() as $variable) {
+            $varName = trim($variable, '{\}');
+            if (array_key_exists($varName, $parameters) === false) {
+                throw new \InvalidArgumentException(
+                    sprintf('%s not found in parameters to generate url', $varName)
+                );
+            }
+            $uri = str_replace($variable, $parameters[$varName], $uri);
+        }
+        return $uri;
+    }
+}