From ce271960836526eadbd0e30b949377de4808cfe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sessing=C3=B8?= Date: Sat, 19 Dec 2015 18:07:18 +0100 Subject: [PATCH] [BUGFIX] Bugfixes. - Fixed not validating domain on - Other small changes. --- src/Pecee/SimpleRouter/RouterBase.php | 6 ++++++ src/Pecee/SimpleRouter/RouterGroup.php | 2 +- src/Pecee/SimpleRouter/SimpleRouter.php | 12 ++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php index fbdd3e8..7d4a06b 100644 --- a/src/Pecee/SimpleRouter/RouterBase.php +++ b/src/Pecee/SimpleRouter/RouterBase.php @@ -133,6 +133,12 @@ class RouterBase { continue; } + if($route->getGroup() !== null) { + if($route->getGroup()->matchDomain($this->request) === false) { + continue; + } + } + $routeNotAllowed = false; $this->loadedRoute = $route; diff --git a/src/Pecee/SimpleRouter/RouterGroup.php b/src/Pecee/SimpleRouter/RouterGroup.php index e9fa128..2da215e 100644 --- a/src/Pecee/SimpleRouter/RouterGroup.php +++ b/src/Pecee/SimpleRouter/RouterGroup.php @@ -10,7 +10,7 @@ class RouterGroup extends RouterEntry { parent::__construct(); } - protected function matchDomain(Request $request) { + public function matchDomain(Request $request) { if($this->domain !== null) { if(is_array($this->domain)) { diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php index c244d95..9cbb041 100644 --- a/src/Pecee/SimpleRouter/SimpleRouter.php +++ b/src/Pecee/SimpleRouter/SimpleRouter.php @@ -90,6 +90,18 @@ class SimpleRouter { return $group; } + /** + * Adds get + post route + * + * @param string $url + * @param function $callback + * @param array|null $settings + * @return RouterRoute + */ + public static function basic($url, $callback, array $settings = null) { + return self::match(['get', 'post'], $url, $callback, $settings); + } + public static function match(array $requestMethods, $url, $callback, array $settings = null) { $route = new RouterRoute($url, $callback); $route->setRequestMethods($requestMethods);