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

[FEATURE] Moved loadedRoute to request so it can be easily overwritten

Browse Source 
from middleware.
This commit is contained in:
Simon Sessingø
2016-01-15 10:34:59 +01:00
parent 714edf7902
commit 765204f552
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+8 -8
View File
@@ -15,7 +15,6 @@ class RouterBase {
protected $processedRoutes; protected $processedRoutes;
protected $controllerUrlMap; protected $controllerUrlMap;
protected $backStack; protected $backStack;
protected $loadedRoute;
protected $defaultNamespace; protected $defaultNamespace;
protected $baseCsrfVerifier; protected $baseCsrfVerifier;
@@ -144,9 +143,10 @@ class RouterBase {
$routeNotAllowed = false; $routeNotAllowed = false;
$this->loadedRoute = $route; $this->request->loadedRoute = $route;
$route->loadMiddleware($this->request); $route->loadMiddleware($this->request);
$route->renderRoute($this->request);
$this->request->loadedRoute->renderRoute($this->request);
break; break;
} }
} }
@@ -155,7 +155,7 @@ class RouterBase {
throw new RouterException('Route or method not allowed', 403); throw new RouterException('Route or method not allowed', 403);
} }
if(!$this->loadedRoute) { if(!$this->request->loadedRoute) {
throw new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404); throw new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404);
} }
} }
@@ -178,8 +178,8 @@ class RouterBase {
* @return RouterEntry * @return RouterEntry
*/ */
public function getLoadedRoute() { public function getLoadedRoute() {
if(!($this->loadedRoute instanceof RouterGroup)) { if(!($this->request->loadedRoute instanceof RouterGroup)) {
return $this->loadedRoute; return $this->request->loadedRoute;
} }
return null; return null;
} }
@@ -327,8 +327,8 @@ class RouterBase {
return $url; return $url;
} }
if($controller === null && $this->loadedRoute !== null) { if($controller === null && $this->request->loadedRoute !== null) {
return $this->processUrl($this->loadedRoute, $this->loadedRoute->getMethod(), $parameters, $getParams); return $this->processUrl($this->request->loadedRoute, $this->request->loadedRoute->getMethod(), $parameters, $getParams);
} }
$c = ''; $c = '';