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

Bugfixes

Browse Source
This commit is contained in:
Simon Sessingø
2016-11-16 15:15:51 +01:00
parent 8478899eb6
commit 75566dc2ba
4 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -138,6 +138,8 @@ class CustomExceptionHandler implements IExceptionHandler {
// Throw your custom 404-page view
// - or -
// load another route with our 404 page
// - or -
// you can return the $request object to ignore the error and continue on rendering the route.
return $request->setUri(url('page.notfound'));
}

4
src/Pecee/Http/Middleware/IMiddleware.php
View File

@@ -8,9 +8,9 @@ interface IMiddleware {
/**
* @param Request $request
* @param RouterEntry|null $route
* @param RouterEntry $route
* @return Request|null
*/
public function handle(Request $request, RouterEntry &$route = null);
public function handle(Request $request, RouterEntry &$route);
}

57
src/Pecee/SimpleRouter/RouterBase.php
View File

@@ -129,6 +129,9 @@ class RouterBase {
if($backStack && $group !== null) {
$route->setGroup($group);
} else {
$prefixes = [];
$group = null;
}
if($route->getNamespace() === null && $this->defaultNamespace !== null) {
@@ -140,11 +143,6 @@ class RouterBase {
$route->setNamespace($namespace);
}
if($group !== null && $group->getPrefix() !== null && trim($group->getPrefix(), '/') !== '') {
$prefixes[] = trim($group->getPrefix(), '/');
}
$group = null;
$this->currentRoute = $route;
if($route instanceof ILoadableRoute) {
@@ -154,22 +152,30 @@ class RouterBase {
$this->controllerUrlMap[] = $route;
} else {
if(is_callable($route->getCallback())) {
$route->renderRoute($this->request);
if($route instanceof RouterGroup) {
if ($route->matchRoute($this->request)) {
if ($route->getPrefix() !== null && trim($route->getPrefix(), '/') !== '') {
$prefixes[] = trim($route->getPrefix(), '/');
}
/* @var $group RouterGroup */
$group = $route;
if (is_callable($route->getCallback())) {
$mergedSettings = array_merge($settings, $group->getMergeableSettings());
$route->renderRoute($this->request);
if ($route->matchRoute($this->request)) {
/* @var $group RouterGroup */
$group = $route;
$mergedSettings = array_merge($settings, $group->getMergeableSettings());
// Add ExceptionHandler
if ($group->getExceptionHandler() !== null) {
$this->exceptionHandlers[] = $route;
}
// Add ExceptionHandler
if ($group->getExceptionHandler() !== null) {
$this->exceptionHandlers[] = $route;
}
}
}
}
@@ -191,16 +197,13 @@ class RouterBase {
$this->loadedRoute = null;
$routeNotAllowed = false;
// Create a fictive request - so it can be changed in the middleware or exceptionhandler later on...
$request = clone $this->request;
try {
// Initialize boot-managers
if(count($this->bootManagers)) {
/* @var $manager RouterBootManager */
foreach($this->bootManagers as $manager) {
$request = $manager->boot($request);
$this->request = $manager->boot($this->request);
if(!($this->request instanceof Request)) {
throw new RouterException('Custom router bootmanager "'. get_class($manager) .'" must return instance of Request.');
@@ -220,16 +223,14 @@ class RouterBase {
}
}
$request = ($newRequest !== null) ? $newRequest : $request;
/* @var $route RouterEntry */
for ($i = 0; $i < count($this->controllerUrlMap); $i++) {
$route = $this->controllerUrlMap[$i];
if ($route->matchRoute($request)) {
if ($route->matchRoute($this->request)) {
if (count($route->getRequestMethods()) && !in_array($request->getMethod(), $route->getRequestMethods())) {
if (count($route->getRequestMethods()) && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
$routeNotAllowed = true;
continue;
}
@@ -238,16 +239,16 @@ class RouterBase {
$this->loadedRoute = $route;
$request = $this->loadedRoute->loadMiddleware($request, $this->loadedRoute);
$request = ($request === null) ? $this->request : $request;
$request = clone $this->request;
$this->loadedRoute->loadMiddleware($request, $this->loadedRoute);
if($request !== null && $request->getUri() !== $this->request->getUri() && !in_array($request->getUri(), $this->routeChanges)) {
if($request->getUri() !== $this->request->getUri() && !in_array($request->getUri(), $this->routeChanges)) {
$this->routeChanges[] = $request->getUri();
$this->routeRequest($request);
return;
}
$this->loadedRoute->renderRoute($request);
$this->loadedRoute->renderRoute($this->request);
break;
}
@@ -262,7 +263,7 @@ class RouterBase {
}
if($this->loadedRoute === null) {
$this->handleException(new RouterException(sprintf('Route not found: %s', $request->getUri()), 404));
$this->handleException(new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404));
}
}

4
test/GroupTest.php
View File

@@ -64,6 +64,10 @@ class GroupTest extends PHPUnit_Framework_TestCase {
public function testUrls() {
\Pecee\SimpleRouter\RouterBase::getInstance()->reset();
\Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/fancy/url/1');
\Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
\Pecee\SimpleRouter\SimpleRouter::get('/my/fancy/url/1', 'DummyController@start', ['as' => 'fancy1']);
\Pecee\SimpleRouter\SimpleRouter::get('/my/fancy/url/2', 'DummyController@start')->setAlias('fancy2');