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

Merge pull request #100 from skipperbent/development

Browse Source 
Development
This commit is contained in:
Simon Sessingø
2016-04-25 00:41:50 +02:00
parent 355ef01d63 f98e5ac59d
commit 5a50190293
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+8 -4
View File
@@ -89,9 +89,9 @@ class RouterBase {
$route->renderRoute($this->request); $route->renderRoute($this->request);
$mergedSettings = array_merge($settings, $route->getMergeableSettings()); $mergedSettings = array_merge($settings, $route->getMergeableSettings());
// Add exceptionhandler // Add ExceptionHandler
if($route->matchRoute($this->request) && $route->getExceptionHandler() !== null) { if($route->matchRoute($this->request) && $route->getExceptionHandler() !== null) {
$this->exceptionHandlers[] = $route->getExceptionHandler(); $this->exceptionHandlers[] = $route;
} }
} }
@@ -178,8 +178,12 @@ class RouterBase {
protected function handleException(\Exception $e) { protected function handleException(\Exception $e) {
foreach ($this->exceptionHandlers as $handler) { /* @var $route RouterEntry */
$handler = new $handler($this->request); foreach ($this->exceptionHandlers as $route) {
$route->loadMiddleware($this->request);
$handler = $route->getExceptionHandler();
$handler = new $handler();
if (!($handler instanceof IExceptionHandler)) { if (!($handler instanceof IExceptionHandler)) {
throw new RouterException('Exception handler must implement the IExceptionHandler interface.'); throw new RouterException('Exception handler must implement the IExceptionHandler interface.');
} }