geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 04:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #135 from skipperbent/v2-development

Browse Source 
Bugfixes
This commit is contained in:
Simon Sessingø
2016-11-16 15:32:32 +02:00
committed by GitHub
parent 4bec2bc5fb 8478899eb6
commit ad0eceb814
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+3 -14
View File
@@ -268,8 +268,6 @@ class RouterBase {
protected function handleException(\Exception $e) { protected function handleException(\Exception $e) {
$request = clone $this->request;
/* @var $route RouterGroup */ /* @var $route RouterGroup */
foreach ($this->exceptionHandlers as $route) { foreach ($this->exceptionHandlers as $route) {
$handler = $route->getExceptionHandler(); $handler = $route->getExceptionHandler();
@@ -279,20 +277,11 @@ class RouterBase {
throw new RouterException('Exception handler must implement the IExceptionHandler interface.'); throw new RouterException('Exception handler must implement the IExceptionHandler interface.');
} }
$request = $handler->handleError($request, $this->loadedRoute, $e); $request = $handler->handleError($this->request, $this->loadedRoute, $e);
$request = ($request === null) ? $this->request : $request;
if(!in_array($request->getUri(), $this->routeChanges)) {
if($request !== null && !in_array($request->getUri(), $this->routeChanges)) {
$this->routeChanges[] = $request->getUri(); $this->routeChanges[] = $request->getUri();
$this->routeRequest($request);
if($request->getUri() !== $this->request->getUri()) {
$this->routeRequest($request);
} else {
$this->loadedRoute->renderRoute($request);
}
return;
} }
} }
src/Pecee/SimpleRouter/RouterEntry.php
+1 -1
View File
@@ -269,7 +269,7 @@ abstract class RouterEntry {
return null; return null;
} }
public function loadMiddleware(Request $request, RouterRoute &$route) { public function loadMiddleware(Request $request, RouterEntry &$route) {
if(count($this->getMiddleware())) { if(count($this->getMiddleware())) {
foreach($this->getMiddleware() as $middleware) { foreach($this->getMiddleware() as $middleware) {
$middleware = $this->loadClass($middleware); $middleware = $this->loadClass($middleware);