geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-17 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #95 from skipperbent/development

Browse Source 
Development
This commit is contained in:
Simon Sessingø
2016-04-16 23:23:56 +02:00
parent 899081f8d8 eb3ddf2bf7
commit 6e14ded03f
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/Http/Input/Input.php
+1 -1
View File
@@ -89,7 +89,7 @@ class Input {
return ($key !== null && isset($item->getValue()[$key])) ? $item->getValue()[$key] : $item->getValue();
}
return ($item->getValue() === null) ? $default : $item->getValue();
return (trim($item->getValue()) === '') ? $default : $item->getValue();
}
return $default;
src/Pecee/SimpleRouter/RouterBase.php
+7 -8
View File
@@ -111,13 +111,6 @@ class RouterBase {
$originalUri = $this->request->getUri();
// Load group middlewares
/* @var $middleware RouterEntry */
foreach($this->middlewaresToLoad as $middleware) {
$middleware->loadMiddleware($this->request);
}
// Initialize boot-managers
if(count($this->bootManagers)) {
/* @var $manager RouterBootManager */
@@ -138,6 +131,12 @@ class RouterBase {
// Loop through each route-request
$this->processRoutes($this->routes);
// Load group middlewares
/* @var $route RouterEntry */
foreach($this->middlewaresToLoad as $route) {
$route->loadMiddleware($this->request);
}
$routeNotAllowed = false;
// Make sure routes with longer urls are rendered first
@@ -309,7 +308,7 @@ class RouterBase {
return '';
}
protected function processUrl($route, $method = null, $parameters = null, $getParams = null) {
protected function processUrl(RouterRoute $route, $method = null, $parameters = null, $getParams = null) {
$domain = '';