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

[BUGFIXES] Bugfixes

Browse Source
This commit is contained in:
Simon Sessingø
2015-09-25 00:00:29 +02:00
parent e414303aff
commit 1c765476b5
2 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+21 -26
View File
@@ -14,7 +14,7 @@ class RouterBase {
protected $requestUri; protected $requestUri;
protected $requestMethod; protected $requestMethod;
protected $loadedClass; protected $loadedClass;
protected $defaultControllerNamespace; protected $defaultNamespace;
public function __construct() { public function __construct() {
$this->routes = array(); $this->routes = array();
@@ -25,6 +25,15 @@ class RouterBase {
} }
public function addRoute(RouterEntry $route) { public function addRoute(RouterEntry $route) {
if($route instanceof RouterRoute && stripos($route->getCallback(), '@') !== false) {
$this->controllerUrlMap[$route->getCallback()] = $route;
} else if($route instanceof RouterController) {
$this->controllerUrlMap[$route->getController()] = $route;
} else if($route instanceof RouterGroup) {
$this->renderRoute($route);
}
if($this->currentRoute !== null) { if($this->currentRoute !== null) {
$this->backstack[] = $route; $this->backstack[] = $route;
} else { } else {
@@ -43,7 +52,7 @@ class RouterBase {
public function renderRoute(RouterEntry $route) { public function renderRoute(RouterEntry $route) {
$this->currentRoute = $route; $this->currentRoute = $route;
// Load middlewares if any // Load middlewares
if($route->getMiddleware()) { if($route->getMiddleware()) {
$this->loadClass($route->getMiddleware()); $this->loadClass($route->getMiddleware());
} }
@@ -79,13 +88,13 @@ class RouterBase {
/* @var $route RouterEntry */ /* @var $route RouterEntry */
foreach($routes as $route) { foreach($routes as $route) {
if($this->defaultControllerNamespace) { if($this->defaultNamespace) {
$namespace = null; $namespace = null;
if ($route->getNamespace()) { if ($route->getNamespace()) {
$namespace = $this->defaultControllerNamespace . '\\' . $route->getNamespace(); $namespace = $this->defaultNamespace . '\\' . $route->getNamespace();
} else { } else {
$namespace = $this->defaultControllerNamespace; $namespace = $this->defaultNamespace;
} }
$route->setNamespace($namespace); $route->setNamespace($namespace);
@@ -98,27 +107,13 @@ class RouterBase {
$route->setSettings($settings); $route->setSettings($settings);
if($route instanceof RouterRoute) { if($route instanceof RouterRoute || $route instanceof RouterController) {
if(is_array($prefixes) && count($prefixes)) { if(is_array($prefixes) && count($prefixes)) {
$route->setUrl( '/' . join('/', $prefixes) . $route->getUrl() ); $route->setUrl( '/' . join('/', $prefixes) . $route->getUrl() );
} }
if(stripos($route->getCallback(), '@') !== false) {
$this->controllerUrlMap[$route->getCallback()] = $route;
}
}
if($route instanceof RouterController) {
if(is_array($prefixes) && count($prefixes)) {
$route->setUrl( '/' . join('/', $prefixes) . $route->getUrl() );
}
$this->controllerUrlMap[$route->getController()] = $route;
} }
// Stop if the route matches // Stop if the route matches
$route = $route->getRoute($this->requestMethod, $this->requestUri); $route = $route->getRoute($this->requestMethod, $this->requestUri);
if($route) { if($route) {
$this->renderRoute($route); $this->renderRoute($route);
@@ -143,15 +138,15 @@ class RouterBase {
/** /**
* @return string * @return string
*/ */
public function getDefaultControllerNamespace(){ public function getDefaultNamespace(){
return $this->defaultControllerNamespace; return $this->defaultNamespace;
} }
/** /**
* @param string $defaultControllerNamespace * @param string $defaultNamespace
*/ */
public function setDefaultControllerNamespace($defaultControllerNamespace) { public function setDefaultNamespace($defaultNamespace) {
$this->defaultControllerNamespace = $defaultControllerNamespace; $this->defaultNamespace = $defaultNamespace;
} }
/** /**
@@ -201,7 +196,7 @@ class RouterBase {
foreach($this->controllerUrlMap as $c => $route) { foreach($this->controllerUrlMap as $c => $route) {
$params = $route->getParameters(); $params = $route->getParameters();
if(strtolower($c) === strtolower($controller)) { if(strtolower($c) === strtolower($controller) || stripos($c, $controller) === 0) {
$url = $route->getUrl(); $url = $route->getUrl();
src/Pecee/SimpleRouter/SimpleRouter.php
+1 -1
View File
@@ -13,7 +13,7 @@ class SimpleRouter {
public static function start($defaultNamespace = null) { public static function start($defaultNamespace = null) {
$router = RouterBase::GetInstance(); $router = RouterBase::GetInstance();
$router->setDefaultControllerNamespace($defaultNamespace); $router->setDefaultNamespace($defaultNamespace);
$router->routeRequest(); $router->routeRequest();
} }