Add Unittests for new changes

Author: marcelthole

src/Map.php

@@ -431,20 +431,32 @@ public function getAsTreeRouteNode()
     {
         $treeRoutes = [];
         foreach ($this->routes as $route) {
-            if (! $route->isRoutable) {
+            if (! $route->isRoutable || $route->path === null) {
                 continue;
             }
 
-            // replace all parameters with {}
+            // replace "{/year,month,day}" parameters with /{}/{}/{}
+            $routePath = preg_replace_callback(
+                '~{/((?:\w+,?)+)}~',
+                static function (array $matches) {
+                    $variables = explode(',', $matches[1]);
+
+                    return '/' . implode('/', array_fill(0, count($variables), '{}'));
+                },
+                $route->path
+            ) ?: $route->path;
+            $paramsAreOptional = $routePath !== $route->path;
+
             // This regexp will also work with "{controller:[a-zA-Z][a-zA-Z0-9_-]{1,}}"
-            $routePath = preg_replace('~{(?:[^{}]*|(?R))*}~', '{}', $route->path);
+            $routePath = preg_replace('~{(?:[^{}]*|(?R))*}~', '{}', $routePath) ?: $routePath;
             $node = &$treeRoutes;
             foreach (explode('/', trim($routePath, '/')) as $segment) {
-                if (strpos($segment, '{') === 0 || strpos($segment, ':') === 0) {
-                    for ($i = 0; $i <= substr_count($segment, ','); $i++) {
-                        $node = &$node['{}'];
+                if (strpos($segment, '{') === 0) {
+                    if ($paramsAreOptional) {
                         $node[spl_object_hash($route)] = $route;
                     }
+                    $node = &$node['{}'];
+                    $node[spl_object_hash($route)] = $route;
                     continue;
                 }
                 $node = &$node[$segment];

tests/MapTest.php

@@ -137,4 +137,53 @@ public function testGetAndSetRoutes()
         $this->assertIsRoute($actual['page.read']);
         $this->assertEquals('/page/{id}{format}', $actual['page.read']->path);
     }
+
+    public function testGetAsTreeRouteNodeSuccess(): void
+    {
+        $routes = [
+            (new Route())->path('/api/users'),
+            (new Route())->path('/api/users/{id}'),
+            (new Route())->path('/api/users/{id}/delete'),
+            (new Route())->path('/api/archive{/year,month,day}'),
+            (new Route())->path('/api/{controller:[a-zA-Z][a-zA-Z0-9_-]{1,}}/{action}'),
+            (new Route())->path('/api/users/{id}/not-routeable')->isRoutable(false),
+        ];
+        $sut = new Map(new Route());
+        $sut->setRoutes($routes);
+
+        $result = $sut->getAsTreeRouteNode();
+
+        $this->assertSame([
+            'api' => [
+                'users' => [
+                    spl_object_hash($routes[0]) => $routes[0],
+                    '{}' => [
+                        spl_object_hash($routes[1]) => $routes[1],
+                        spl_object_hash($routes[2]) => $routes[2],
+                        'delete' => [
+                            spl_object_hash($routes[2]) => $routes[2],
+                        ],
+                    ],
+                ],
+                'archive' => [
+                    spl_object_hash($routes[3]) => $routes[3],
+                    '{}' => [ // year
+                        spl_object_hash($routes[3]) => $routes[3],
+                        '{}' => [ // month
+                            spl_object_hash($routes[3]) => $routes[3],
+                            '{}' => [ // day
+                                spl_object_hash($routes[3]) => $routes[3],
+                            ],
+                        ],
+                    ],
+                ],
+                '{}' => [
+                    spl_object_hash($routes[4]) => $routes[4],
+                    '{}' => [
+                        spl_object_hash($routes[4]) => $routes[4],
+                    ],
+                ],
+            ],
+        ], $result);
+    }
 }

tests/MatcherTest.php

@@ -1,6 +1,8 @@
 <?php
 namespace Aura\Router;
 
+use Aura\Router\Rule\RuleIterator;
+use Psr\Log\LoggerInterface;
 use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 use GuzzleHttp\Psr7\ServerRequest;
 
@@ -264,4 +266,35 @@ public function testLogger()
         $this->assertSame($expect, $actual);
         $this->assertRoute($bar, $matcher->getMatchedRoute());
     }
+
+    public function testMatchWithMatchedTree()
+    {
+        $routes = [
+            (new Route())->path('/api/users'),
+            (new Route())->path('/api/users/{id}'),
+            (new Route())->path('/api/users/{id}/delete'),
+            (new Route())->path('/api/archive{/year,month,day}'),
+            (new Route())->path('/api/{controller:[a-zA-Z][a-zA-Z0-9_-]{1,}}/{action}'),
+            (new Route())->path('/not-routeable')->isRoutable(false),
+        ];
+        $map = new Map(new Route());
+        $map->setRoutes($routes);
+
+        $sut = new Matcher(
+            $map,
+            $this->createMock(LoggerInterface::class),
+            new RuleIterator()
+        );
+
+        self::assertNotFalse($sut->match($this->newRequest('/api/users')));
+        self::assertNotFalse($sut->match($this->newRequest('/api/users/1')));
+        self::assertNotFalse($sut->match($this->newRequest('/api/users/1/delete')));
+        self::assertNotFalse($sut->match($this->newRequest('/api/archive')));
+        self::assertNotFalse($sut->match($this->newRequest('/api/archive/2025')));
+        self::assertNotFalse($sut->match($this->newRequest('/api/archive/2025/05')));
+        self::assertNotFalse($sut->match($this->newRequest('/api/archive/2025/05/22')));
+        self::assertNotFalse($sut->match($this->newRequest('/api/valid-controller-name/action')));
+
+        self::assertFalse($sut->match($this->newRequest('/not-routeable')));
+    }
 }