refactor(router): optional marker is now in the front

Author: xHeaven

packages/router/src/Routing/Construction/DiscoveredRoute.php

@@ -12,10 +12,10 @@ final class DiscoveredRoute implements Route
 {
     public const string DEFAULT_MATCHING_GROUP = '[^/]++';
 
-    public const string ROUTE_PARAM_NAME_REGEX = '(\w*)';
-
     public const string ROUTE_PARAM_OPTIONAL_REGEX = '(\??)';
 
+    public const string ROUTE_PARAM_NAME_REGEX = '(\w*)';
+
     public const string ROUTE_PARAM_CUSTOM_REGEX = '(?::([^{}]*(?:\{(?-1)\}[^{}]*)*))?';
 
     /** @param \Tempest\Router\RouteDecorator[] $decorators */
@@ -62,12 +62,12 @@ private function __construct(
      */
     private static function getRouteParams(string $uriPart): array
     {
-        $regex = '#\{' . self::ROUTE_PARAM_NAME_REGEX . self::ROUTE_PARAM_OPTIONAL_REGEX . self::ROUTE_PARAM_CUSTOM_REGEX . '\}#';
+        $regex = '#\{' . self::ROUTE_PARAM_OPTIONAL_REGEX . self::ROUTE_PARAM_NAME_REGEX . self::ROUTE_PARAM_CUSTOM_REGEX . '\}#';
 
         preg_match_all($regex, $uriPart, $matches);
 
-        $names = $matches[1] ?? [];
-        $optionalMarkers = $matches[2] ?? [];
+        $optionalMarkers = $matches[1] ?? [];
+        $names = $matches[2] ?? [];
 
         $optional = [];
         foreach ($names as $i => $name) {

packages/router/src/Routing/Construction/RouteTreeNode.php

@@ -63,7 +63,7 @@ public function setTargetRoute(MarkedRoute $markedRoute, bool $allowDuplicate =
 
     private static function convertDynamicSegmentToRegex(string $uriPart): string
     {
-        $regex = '#\{' . DiscoveredRoute::ROUTE_PARAM_NAME_REGEX . DiscoveredRoute::ROUTE_PARAM_OPTIONAL_REGEX . DiscoveredRoute::ROUTE_PARAM_CUSTOM_REGEX . '\}#';
+        $regex = '#\{' . DiscoveredRoute::ROUTE_PARAM_OPTIONAL_REGEX . DiscoveredRoute::ROUTE_PARAM_NAME_REGEX . DiscoveredRoute::ROUTE_PARAM_CUSTOM_REGEX . '\}#';
 
         return preg_replace_callback(
             $regex,

packages/router/tests/OptionalParametersTest.php

@@ -22,7 +22,7 @@ public function test_route_with_optional_parameter_matches_both_paths(): void
         $tree = new RoutingTree();
 
         $markedRoute = $routeBuilder
-            ->withUri('/users/{id?}')
+            ->withUri('/users/{?id}')
             ->withHandler('handlerWithOptionalId')
             ->asMarkedRoute('a');
 
@@ -43,12 +43,12 @@ public function test_route_with_optional_parameter_matches_both_paths(): void
 
         $matchedWithoutParam = $matcher->match(new GenericRequest(Method::GET, '/users'));
         $this->assertNotNull($matchedWithoutParam);
-        $this->assertEquals('/users/{id?}', $matchedWithoutParam->route->uri);
+        $this->assertEquals('/users/{?id}', $matchedWithoutParam->route->uri);
         $this->assertEquals(['id' => 'default-id'], $matchedWithoutParam->params);
 
         $matchedWithParam = $matcher->match(new GenericRequest(Method::GET, '/users/123'));
         $this->assertNotNull($matchedWithParam);
-        $this->assertEquals('/users/{id?}', $matchedWithParam->route->uri);
+        $this->assertEquals('/users/{?id}', $matchedWithParam->route->uri);
         $this->assertEquals(['id' => '123'], $matchedWithParam->params);
     }
 
@@ -58,7 +58,7 @@ public function test_route_with_multiple_optional_parameters(): void
         $tree = new RoutingTree();
 
         $markedRoute = $routeBuilder
-            ->withUri('/posts/{id?}/{slug?}')
+            ->withUri('/posts/{?id}/{?slug}')
             ->withHandler('handlerWithTwoOptionalParams')
             ->asMarkedRoute('a');
 
@@ -96,7 +96,7 @@ public function test_route_with_required_and_optional_parameters(): void
         $tree = new RoutingTree();
 
         $markedRoute = $routeBuilder
-            ->withUri('/posts/{id}/{slug?}')
+            ->withUri('/posts/{id}/{?slug}')
             ->withHandler('handlerWithRequiredAndOptional')
             ->asMarkedRoute('a');
 
@@ -130,7 +130,7 @@ public function test_route_with_optional_parameter_and_custom_regex(): void
         $tree = new RoutingTree();
 
         $markedRoute = $routeBuilder
-            ->withUri('/users/{id?:\d+}')
+            ->withUri('/users/{?id:\d+}')
             ->withHandler('handlerWithOptionalId')
             ->asMarkedRoute('a');
 
@@ -166,7 +166,7 @@ public function test_optional_parameters_are_parsed_correctly(): void
         $routeBuilder = new FakeRouteBuilderWithOptionalParams();
 
         $route = $routeBuilder
-            ->withUri('/users/{id?}')
+            ->withUri('/users/{?id}')
             ->withHandler('handlerWithOptionalId')
             ->asDiscoveredRoute();
 
@@ -179,7 +179,7 @@ public function test_mixed_optional_and_required_parameters_are_parsed_correctly
         $routeBuilder = new FakeRouteBuilderWithOptionalParams();
 
         $route = $routeBuilder
-            ->withUri('/posts/{id}/{slug?}')
+            ->withUri('/posts/{id}/{?slug}')
             ->withHandler('handlerWithRequiredAndOptional')
             ->asDiscoveredRoute();