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

Fixed issue with PDO exception not returning correct type for error-code.

Browse Source
This commit is contained in:
Simon Sessingo
2018-02-27 08:20:25 +01:00
parent 6d7d07669b
commit 79c82c90cc
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Pecee/Http/Security/CookieTokenProvider.php
View File

@@ -36,7 +36,7 @@ class CookieTokenProvider implements ITokenProvider
try {
return bin2hex(random_bytes(32));
} catch(\Exception $e) {
throw new SecurityException($e->getMessage(), $e->getCode(), $e->getPrevious());
throw new SecurityException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
}
}

12
src/Pecee/SimpleRouter/Router.php
View File

@@ -124,6 +124,11 @@ class Router
$exceptionHandlers = [];
// Stop processing routes if no valid route is found.
if($this->request->getRewriteRoute() === null && $this->request->getUrl() === null) {
return;
}
$url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUrl()->getPath();
foreach ($routes as $route) {
@@ -200,11 +205,6 @@ class Router
*/
public function loadRoutes()
{
// Stop processing routes if no valid route is found.
if($this->request->getRewriteRoute() === null && $this->request->getUrl() === null) {
return;
}
/* Initialize boot-managers */
/* @var $manager IRouterBootManager */
foreach ($this->bootManagers as $manager) {
@@ -365,7 +365,7 @@ class Router
}
}
throw new HttpException($e->getMessage(), $e->getCode(), $e->getPrevious());
throw new HttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
}
public function arrayToParams(array $getParams = [], $includeEmpty = true)