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

Bugfixes

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

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

@@ -268,8 +268,6 @@ class RouterBase {
protected function handleException(\Exception $e) {
$request = clone $this->request;
/* @var $route RouterGroup */
foreach ($this->exceptionHandlers as $route) {
$handler = $route->getExceptionHandler();
@@ -279,20 +277,11 @@ class RouterBase {
throw new RouterException('Exception handler must implement the IExceptionHandler interface.');
}
$request = $handler->handleError($request, $this->loadedRoute, $e);
$request = ($request === null) ? $this->request : $request;
if(!in_array($request->getUri(), $this->routeChanges)) {
$request = $handler->handleError($this->request, $this->loadedRoute, $e);
if($request !== null && !in_array($request->getUri(), $this->routeChanges)) {
$this->routeChanges[] = $request->getUri();
if($request->getUri() !== $this->request->getUri()) {
$this->routeRequest($request);
} else {
$this->loadedRoute->renderRoute($request);
}
return;
$this->routeRequest($request);
}
}

2
src/Pecee/SimpleRouter/RouterEntry.php
View File

@@ -269,7 +269,7 @@ abstract class RouterEntry {
return null;
}
public function loadMiddleware(Request $request, RouterRoute &$route) {
public function loadMiddleware(Request $request, RouterEntry &$route) {
if(count($this->getMiddleware())) {
foreach($this->getMiddleware() as $middleware) {
$middleware = $this->loadClass($middleware);