mirror of
https://github.com/skipperbent/simple-php-router.git
synced 2026-07-11 13:32:16 +00:00
Fixed double / when calling findUrl on routes with the first
parameter optional.
This commit is contained in:
@@ -144,6 +144,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$url = '/' . ltrim($url, '/');
|
||||||
$url .= join('/', $unknownParams);
|
$url .= join('/', $unknownParams);
|
||||||
|
|
||||||
return rtrim($url, '/') . '/';
|
return rtrim($url, '/') . '/';
|
||||||
|
|||||||
@@ -28,6 +28,21 @@ class RouterUrlTest extends PHPUnit_Framework_TestCase
|
|||||||
TestRouter::router()->reset();
|
TestRouter::router()->reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testUnicodeCharacters()
|
||||||
|
{
|
||||||
|
// Test spanish characters
|
||||||
|
TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
|
||||||
|
TestRouter::debugNoReset('/cursos/listado/especialidad/cirugía local', 'get');
|
||||||
|
$this->assertEquals('/cursos/listado/{listado?}/{category?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
|
||||||
|
|
||||||
|
// Test danish characters
|
||||||
|
TestRouter::get('/kategori/økse', 'DummyController@method1', ['defaultParameterRegex' => '[\w\ø]+']);
|
||||||
|
TestRouter::debugNoReset('/kategori/økse', 'get');
|
||||||
|
$this->assertEquals('/kategori/økse/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
|
||||||
|
|
||||||
|
TestRouter::router()->reset();
|
||||||
|
}
|
||||||
|
|
||||||
public function testOptionalParameters()
|
public function testOptionalParameters()
|
||||||
{
|
{
|
||||||
TestRouter::get('/aviso/legal', 'DummyController@method1');
|
TestRouter::get('/aviso/legal', 'DummyController@method1');
|
||||||
|
|||||||
Reference in New Issue
Block a user