add static method to create new instance of Route and improve code

Author: Fad M.R

src/Route.php

@@ -4,12 +4,16 @@
 
 namespace DevCoder;
 
+use DevCoder\Traits\RouteTrait;
+
 /**
  * Class Route
  * @package DevCoder
  */
 final class Route
 {
+    use RouteTrait;
+
     /**
      * @var string
      */
@@ -21,9 +25,9 @@ final class Route
     private $path;
 
     /**
-     * @var array<string>
+     * @var mixed
      */
-    private $parameters = [];
+    private $handler;
 
     /**
      * @var array<string>
@@ -33,27 +37,27 @@ final class Route
     /**
      * @var array<string>
      */
-    private $vars = [];
+    private $attributes = [];
 
     /**
      * Route constructor.
      * @param string $name
      * @param string $path
-     * @param array $parameters
-     *    $parameters = [
+     * @param mixed $handler
+     *    $handler = [
      *      0 => (string) Controller name : HomeController::class.
      *      1 => (string|null) Method name or null if invoke method
      *    ]
      * @param array $methods
      */
-    public function __construct(string $name, string $path, array $parameters, array $methods = ['GET'])
+    public function __construct(string $name, string $path, $handler, array $methods = ['GET'])
     {
         if ($methods === []) {
             throw new \InvalidArgumentException('HTTP methods argument was empty; must contain at least one method');
         }
         $this->name = $name;
         $this->path = $path;
-        $this->parameters = $parameters;
+        $this->handler = $handler;
         $this->methods = $methods;
     }
 
@@ -70,7 +74,7 @@ public function match(string $path, string $method): bool
                 return is_string($key);
             }, ARRAY_FILTER_USE_KEY);
             foreach ($values as $key => $value) {
-                $this->vars[$key] = $value;
+                $this->attributes[$key] = $value;
             }
             return true;
         }
@@ -87,9 +91,17 @@ public function getPath(): string
         return $this->path;
     }
 
-    public function getParameters(): array
+    /**
+     * @deprecated use getHandler()
+     */
+    public function getParameters()
+    {
+        return $this->getHandler();
+    }
+
+    public function getHandler()
     {
-        return $this->parameters;
+        return $this->handler;
     }
 
     public function getMethods(): array
@@ -103,13 +115,32 @@ public function getVarsNames(): array
         return reset($matches) ?? [];
     }
 
+    /**
+     * @deprecated use hasAttributes()
+     */
     public function hasVars(): bool
+    {
+        return $this->hasAttributes();
+    }
+
+    public function hasAttributes(): bool
     {
         return $this->getVarsNames() !== [];
     }
 
+    /**
+     * @deprecated use getAttributes()
+     */
     public function getVars(): array
     {
-        return $this->vars;
+        return $this->getAttributes();
+    }
+
+    /**
+     * @return array<string>
+     */
+    public function getAttributes(): array
+    {
+        return $this->attributes;
     }
 }

src/Router.php

@@ -12,7 +12,7 @@ final class Router implements RouterInterface
     private const NO_ROUTE = 404;
 
     /**
-     * @var \ArrayIterator<Route>
+     * @var \ArrayObject<Route>
      */
     private $routes;
 
@@ -27,7 +27,7 @@ final class Router implements RouterInterface
      */
     public function __construct(array $routes = [])
     {
-        $this->routes = new \ArrayIterator();
+        $this->routes = new \ArrayObject();
         $this->urlGenerator = new UrlGenerator($this->routes);
         foreach ($routes as $route) {
             $this->add($route);
@@ -65,7 +65,7 @@ public function generateUri(string $name, array $parameters = []): string
         return $this->urlGenerator->generate($name, $parameters);
     }
 
-    public function getUrlgenerator(): UrlGenerator
+    public function getUrlGenerator(): UrlGenerator
     {
         return $this->urlGenerator;
     }

src/RouterMiddleware.php

@@ -41,12 +41,12 @@ public function process(
     {
         try {
             $route = $this->router->match($request);
-            $controller = $route->getParameters();
+            $routeHandler = $route->getHandler();
             $attributes = array_merge([
-                self::CONTROLLER => $controller[0],
-                self::ACTION => $controller[1] ?? null,
+                self::CONTROLLER => $routeHandler[0],
+                self::ACTION => $routeHandler[1] ?? null,
                 self::NAME => $route->getName(),
-            ], $route->getVars());
+            ], $route->getAttributes());
 
             foreach ($attributes as $key => $value) {
                 $request = $request->withAttribute($key, $value);

src/Traits/RouteTrait.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace DevCoder\Traits;
+
+use DevCoder\Route as BaseRoute;
+
+trait RouteTrait
+{
+    public static function get(string $name, string $path, array $parameters): BaseRoute
+    {
+        return new BaseRoute($name, $path, $parameters);
+    }
+
+    public static function post(string $name, string $path, array $parameters): BaseRoute
+    {
+        return new BaseRoute($name, $path, $parameters, ['POST']);
+    }
+
+    public static function put(string $name, string $path, array $parameters): BaseRoute
+    {
+        return new BaseRoute($name, $path, $parameters, ['PUT']);
+    }
+
+    public static function delete(string $name, string $path, array $parameters): BaseRoute
+    {
+        return new BaseRoute($name, $path, $parameters, ['DELETE']);
+    }
+}

src/UrlGenerator.php

@@ -23,8 +23,9 @@ public function generate(string $name, array $parameters = []): string
                 sprintf('Unknown %s name route', $name)
             );
         }
+        /*** @var Route $route */
         $route = $this->routes[$name];
-        if ($route->hasVars() && $parameters === []) {
+        if ($route->hasAttributes() === true && $parameters === []) {
             throw new \InvalidArgumentException(
                 sprintf('%s route need parameters: %s', $name, implode(',', $route->getVarsNames()))
             );