geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-16 02:30:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #671 from skipperbent/v5-release

Browse Source 
V5 release
This commit is contained in:
Simon Sessingø
2023-05-06 21:14:29 +02:00
committed by GitHub
parent 12b6e3c1ab 7feb464af1
commit cd891d5334
5 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Pecee/SimpleRouter/Route/LoadableRoute.php
View File

@@ -91,6 +91,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
$parameters = array_fill_keys($matches[1], null);
}
}
$this->parameters = $parameters;
return $this;

14
src/Pecee/SimpleRouter/Route/RouteResource.php
View File

@@ -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

11
tests/Pecee/SimpleRouter/RouterResourceTest.php
View File

@@ -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();

2
tests/Pecee/SimpleRouter/RouterUrlTest.php
View File

@@ -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();
}

5
tests/TestRouter.php
View File

@@ -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();