add route pattern to Router class

Author: FranklinEkemezie

app/Core/Database.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+use PDO;
+
+namespace PHPAether\Core\Database;
+
+class Database
+{
+
+    protected ?PDO $conn = null;
+
+    private function __construct()
+    {
+    }
+
+    public static function getInstance(): self
+    {
+        if (is_null($this->conn)) {
+            $this->conn = new PDO("");
+        }
+
+        return new static();
+    }
+
+    // Forward all method call to PDO methods
+
+}

app/Core/Router.php

@@ -40,12 +40,14 @@ public function getRegisteredRoutes(): array
     public function route(Request $request): array
     {
 
-        // Check if route info is found
-        if (! ($requestRouteInfo = $this->routes[$request->route] ?? null)) {
+        $matchedRoute = $this->matchRequestRoute($request->route);
+        if ($matchedRoute === null) {
             return ['Error', 'notFound'];
         }
 
-        $requestRouteInfo = $this->parseRouteInfo($requestRouteInfo, $request->method);
+        $requestRouteInfo = $this->parseRouteInfo(
+            $this->routes[$matchedRoute], $request->method
+        );
 
         // Get the controller
         $controller = $requestRouteInfo['controller'];
@@ -54,7 +56,73 @@ public function route(Request $request): array
         return [$controller, $action];
     }
 
-    private function parseRouteInfo(array $routeInfo, string $requestMethod): ?array
+    private function matchRequestRoute(string $requestRoute): ?string
+    {
+
+        foreach ($this->routes as $route => $routeInfo) {
+            if ($route === $requestRoute) {
+                return $route;
+            }
+
+            if ($this->routeIsRoutePattern($route)) {
+
+                $routeParams = $this->getRoutePatternParameters($route);
+                $routePatternRegex = $this->buildRoutePatternRegex($route, $routeParams);
+
+                if (preg_match($routePatternRegex, $requestRoute)) {
+                    return $route;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private function buildRoutePatternRegex(
+        string $routePattern,
+        array $routeParams
+    )
+    {
+        $regexStr = implode("/", array_map(function (string $chunk) use ($routeParams) {
+            if (
+                $chunk[0] === ':' &&
+                ($param = substr($chunk, 1)) &&
+                ($paramInfo = $routeParams[$param] ?? null) 
+            ) {
+                $paramType = $paramInfo['type'] ?? "string";
+                return match($paramType) {
+                    "string"    => "\w+",
+                    "number"    => "\d+",
+                    default     => "\w+"
+                };
+                
+            }
+
+            return $chunk;
+        }, explode("/", $routePattern)));
+
+        return "@$regexStr@";
+    }
+
+    private function getRoutePatternParameters(
+        string $route
+    )
+    {
+        return $this->routes[$route]['parameters'] ?? [];
+    }
+
+    private function routeIsRoutePattern(
+        string $route
+    )
+    {
+
+        return ! is_null($this->routes[$route]['parameters'] ?? null);
+    }
+
+
+    private function parseRouteInfo(
+        array $routeInfo, 
+        string $requestMethod): ?array
     {
 
         $getRouteParams = function (string $param) use ($routeInfo, $requestMethod) {
@@ -81,4 +149,4 @@ private function parseRouteInfo(array $routeInfo, string $requestMethod): ?array
 
 
 
-}
+}

tests/MockHTTPRequestTestCase.php

@@ -39,6 +39,16 @@ class MockHTTPRequestTestCase extends TestCase
         '/user/dashboard' => [
             'controller'    => 'User',
             'action'        => 'userDashboardView'
+        ],
+        'book/:id/edit' => [
+            'controller'    => 'Book',
+            'action'        => 'editBook',
+            'methods'       => ['POST', 'PUT'],
+            'parameters'    => [
+                'id'    => [
+                    'type'  => 'number',
+                ]
+            ]
         ]
     ];
 
@@ -107,9 +117,11 @@ public static function httpGETRequestDataProvider(): array
             ['/', '/', ['Home', 'index'], ''],
             ['/login?r_url=/user/dashboard', '/login', ['Auth', 'loginView'], ''],
             ['/user/dashboard', '/user/dashboard', ['User', 'userDashboardView'], ''],
-            ['/leaderboard?league=ruby', '/leaderboard', ['Error', 'notFound'], '']
+            ['/leaderboard?league=ruby', '/leaderboard', ['Error', 'notFound'], ''],
+            ['/book/3/edit', '/book/3/edit', ['Book', 'editBook'], '']
         ];
     }
+
     public static function httpPOSTRequestDataProvider(): array
     {
         return [
@@ -128,4 +140,4 @@ public static function httpPUTRequestDataProvider(): array
         ];
     }
 
-}
+}