Merge pull request #670 from skipperbent/v5-development

Version 5.3.0.5

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -82,15 +82,18 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     {
         $this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/';
 
+        $parameters = [];
         if (strpos($this->url, $this->paramModifiers[0]) !== false) {
 
             $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
 
             if ((bool)preg_match_all('/' . $regex . '/u', $this->url, $matches) !== false) {
-                $this->parameters = array_fill_keys($matches[1], null);
+                $parameters = array_fill_keys($matches[1], null);
             }
         }
 
+        $this->parameters = $parameters;
+
         return $this;
     }
 

src/Pecee/SimpleRouter/Route/RouteResource.php

@@ -68,15 +68,19 @@ class RouteResource extends LoadableRoute implements IControllerRoute
      */
     public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
     {
-        $url = parent::findUrl($method, $parameters, $name);
+        $url = array_search($name, $this->names, true);
 
-        $action = array_search($name, $this->names, true);
+        $parametersUrl = '';
 
-        if ($action !== false) {
-            return $url . $this->urls[$action];
+        if ($parameters !== null && count($parameters) > 0) {
+            $parametersUrl = join('/', $parameters) . '/';
         }
 
-        return $url;
+        if ($url !== false) {
+            return rtrim($this->url . $parametersUrl . $this->urls[$url], '/') . '/';
+        }
+
+        return $this->url . $parametersUrl;
     }
 
     protected function call($method): bool

tests/Pecee/SimpleRouter/Dummy/Route/DummyLoadableRoute.php

@@ -0,0 +1,11 @@
+<?php
+
+use Pecee\Http\Request;
+
+class DummyLoadableRoute extends Pecee\SimpleRouter\Route\LoadableRoute {
+
+    public function matchRoute(string $url, Request $request): bool
+    {
+        return false;
+    }
+}

tests/Pecee/SimpleRouter/LoadableRouteTest.php

@@ -0,0 +1,27 @@
+<?php
+
+require_once 'Dummy/Route/DummyLoadableRoute.php';
+
+class LoadableRouteTest extends \PHPUnit\Framework\TestCase
+{
+    public function testSetUrlUpdatesParameters()
+    {
+        $route = new DummyLoadableRoute();
+        $this->assertEmpty($route->getParameters());
+
+        $route->setUrl('/');
+        $this->assertEmpty($route->getParameters());
+
+        $expected = ['param' => null, 'optionalParam' => null];
+        $route->setUrl('/{param}/{optionalParam?}');
+        $this->assertEquals($expected, $route->getParameters());
+
+        $expected = ['otherParam' => null];
+        $route->setUrl('/{otherParam}');
+        $this->assertEquals($expected, $route->getParameters());
+
+        $expected = [];
+        $route->setUrl('/');
+        $this->assertEquals($expected, $route->getParameters());
+    }
+}

tests/Pecee/SimpleRouter/RouterResourceTest.php

@@ -63,20 +63,19 @@ class RouterResourceTest extends \PHPUnit\Framework\TestCase
         $response = TestRouter::debugOutput('/resource/38', 'get');
 
         $this->assertEquals('show 38', $response);
-
     }
 
     public function testResourceUrls()
     {
         TestRouter::resource('/resource', 'ResourceController')->name('resource');
 
-        TestRouter::debugOutputNoReset('/resource');
+        TestRouter::debugNoReset('/resource');
 
         $this->assertEquals('/resource/3/create/', TestRouter::router()->getUrl('resource.create', ['id' => 3]));
-        $this->assertEquals('/resource/3/edit/', TestRouter::router()->getUrl('resource.edit', ['id' => 3]));
-        $this->assertEquals('/resource/3/', TestRouter::router()->getUrl('resource.update', ['id' => 3]));
-        $this->assertEquals('/resource/3/', TestRouter::router()->getUrl('resource.destroy', ['id' => 3]));
-        $this->assertEquals('/resource/3/', TestRouter::router()->getUrl('resource.delete', ['id' => 3]));
+        $this->assertEquals('/resource/5/edit/', TestRouter::router()->getUrl('resource.edit', ['id' => 5]));
+        $this->assertEquals('/resource/6/', TestRouter::router()->getUrl('resource.update', ['id' => 6]));
+        $this->assertEquals('/resource/9/', TestRouter::router()->getUrl('resource.destroy', ['id' => 9]));
+        $this->assertEquals('/resource/12/', TestRouter::router()->getUrl('resource.delete', ['id' => 12]));
         $this->assertEquals('/resource/', TestRouter::router()->getUrl('resource'));
 
         TestRouter::router()->reset();

tests/Pecee/SimpleRouter/RouterUrlTest.php

@@ -184,7 +184,7 @@ class RouterUrlTest extends \PHPUnit\Framework\TestCase
         // Should match /?jackdaniels=true&cola=yeah
         $this->assertEquals('/?jackdaniels=true&cola=yeah', TestRouter::getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
 
-        TestRouter::router()->reset();
+        TestRouter::reset();
 
     }
 

tests/TestRouter.php

@@ -8,6 +8,11 @@ class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
         static::request()->setHost('testhost.com');
     }
 
+    public static function reset(): void
+    {
+        static::$router = null;
+    }
+
     public static function debugNoReset(string $testUrl, string $testMethod = 'get'): void
     {
         $request = static::request();