Merge pull request #551 from flightphp/route-improvements

fixed issues with @params_with_underscores and prepopulate getUrl() params

flight/net/Route.php

@@ -193,7 +193,7 @@ class Route
      */
     public function hydrateUrl(array $params = []): string
     {
-        $url = preg_replace_callback("/(?:@([a-zA-Z0-9]+)(?:\:([^\/]+))?\)*)/i", function ($match) use ($params) {
+        $url = preg_replace_callback("/(?:@([\w]+)(?:\:([^\/]+))?\)*)/i", function ($match) use ($params) {
             if (isset($match[1]) && isset($params[$match[1]])) {
                 return $params[$match[1]];
             }

flight/net/Router.php

@@ -29,6 +29,11 @@ class Router
      */
     protected array $routes = [];
 
+    /**
+     * The current route that is has been found and executed.
+     */
+    protected ?Route $executedRoute = null;
+
     /**
      * Pointer to current route.
      */
@@ -213,6 +218,7 @@ class Router
         $url_decoded = urldecode($request->url);
         while ($route = $this->current()) {
             if ($route->matchMethod($request->method) && $route->matchUrl($url_decoded, $this->case_sensitive)) {
+                $this->executedRoute = $route;
                 return $route;
             }
             $this->next();
@@ -233,6 +239,11 @@ class Router
         foreach ($this->routes as $route) {
             $potential_aliases[] = $route->alias;
             if ($route->matchAlias($alias)) {
+                // This will make it so the params that already
+                // exist in the url will be passed in.
+                if (!empty($this->executedRoute->params)) {
+                    $params = $params + $this->executedRoute->params;
+                }
                 return $route->hydrateUrl($params);
             }
         }

tests/EngineTest.php

@@ -405,6 +405,34 @@ class EngineTest extends TestCase
         $this->assertEquals('/path1/123', $url);
     }
 
+    public function testGetUrlComplex()
+    {
+        $engine = new Engine();
+        $engine->route('/item/@item_param:[a-z0-9]{16}/by-status/@token:[a-z0-9]{16}', function () {
+            echo 'I win';
+        }, false, 'path_item_1');
+        $url = $engine->getUrl('path_item_1', [ 'item_param' => 1234567890123456, 'token' => 6543210987654321 ]);
+        $this->assertEquals('/item/1234567890123456/by-status/6543210987654321', $url);
+    }
+
+    public function testGetUrlInsideRoute()
+    {
+        $engine = new Engine();
+        $engine->route('/path1/@param:[0-9]{3}', function () {
+            echo 'I win';
+        }, false, 'path1');
+        $found_url = '';
+        $engine->route('/path1/@param:[0-9]{3}/path2', function () use ($engine, &$found_url) {
+
+            // this should pull the param from the first route
+            // since the param names are the same.
+            $found_url = $engine->getUrl('path1');
+        });
+        $engine->request()->url = '/path1/123/path2';
+        $engine->start();
+        $this->assertEquals('/path1/123', $found_url);
+    }
+
     public function testMiddlewareCallableFunction()
     {
         $engine = new Engine();

tests/server-v2/index.php

@@ -199,7 +199,7 @@ echo '
 <li><a href="' . Flight::getUrl('final_group') . '">Mega group</a></li>
 <li><a href="/error">Error</a></li>
 <li><a href="/json">JSON</a></li>
-<li><a href="/json?jsonp=myjson">JSONP</a></li>
+<li><a href="/jsonp?jsonp=myjson">JSONP</a></li>
 <li><a href="/halt">Halt</a></li>
 <li><a href="/redirect">Redirect</a></li>
 </ul>';

tests/server/LayoutMiddleware.php

@@ -73,7 +73,7 @@ class LayoutMiddleware
 <li><a href="{$final_route}">Mega group</a></li>
 <li><a href="/error">Error</a></li>
 <li><a href="/json">JSON</a></li>
-<li><a href="/json?jsonp=myjson">JSONP</a></li>
+<li><a href="/jsonp?jsonp=myjson">JSONP</a></li>
 <li><a href="/halt">Halt</a></li>
 <li><a href="/redirect">Redirect</a></li>
 <li><a href="/streamResponse">Stream</a></li>