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

Merge pull request #656 from skipperbent/v5-release

Browse Source 
V5 release
This commit is contained in:
Simon Sessingø
2023-04-08 20:01:07 +02:00
committed by GitHub
parent 0ff9258776 847cb3e273
commit 97b61fb8bf
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/Router.php
+7 -3
View File
@@ -59,7 +59,7 @@ class Router
* when a route is being processed. * when a route is being processed.
* @var array * @var array
*/ */
protected array$routeStack = []; protected array $routeStack = [];
/** /**
* List of added bootmanagers * List of added bootmanagers
@@ -345,7 +345,7 @@ class Router
try { try {
/* Verify csrf token for request */ /* Verify csrf token for request */
$this->csrfVerifier->handle($this->request); $this->csrfVerifier->handle($this->request);
} catch(Exception $e) { } catch (Exception $e) {
return $this->handleException($e); return $this->handleException($e);
} }
} }
@@ -443,10 +443,14 @@ class Router
} }
} }
} catch (Exception $e) { } catch (\Throwable $e) {
if ($e instanceof Exception) {
return $this->handleException($e); return $this->handleException($e);
} }
return $this->handleException(new Exception($e->getMessage(), $e->getCode()));
}
if ($methodNotAllowed === true) { if ($methodNotAllowed === true) {
$message = sprintf('Route "%s" or method "%s" not allowed.', $this->request->getUrl()->getPath(), $this->request->getMethod()); $message = sprintf('Route "%s" or method "%s" not allowed.', $this->request->getUrl()->getPath(), $this->request->getMethod());
return $this->handleException(new NotFoundHttpException($message, 403)); return $this->handleException(new NotFoundHttpException($message, 403));