From 3a8218687f1d1cfa50e2c86ebc77cdd94992e2a8 Mon Sep 17 00:00:00 2001 From: steampixel Date: Tue, 13 Mar 2018 16:25:37 +0100 Subject: [PATCH] Fixed mixed indents --- Route.php | 112 +++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/Route.php b/Route.php index 657c53c..dfd91ec 100644 --- a/Route.php +++ b/Route.php @@ -1,89 +1,89 @@ $expression, - 'function' => $function, + public static function add($expression, $function, $method = 'get'){ + array_push(self::$routes,Array( + 'expression' => $expression, + 'function' => $function, 'method' => $method - )); - } - - public static function pathNotFound($function){ - self::$pathNotFound = $function; - } - - public static function methodNotAllowed($function){ - self::$methodNotAllowed = $function; - } - - public static function run($basepath = '/'){ - - // Parse current url - $parsed_url = parse_url($_SERVER['REQUEST_URI']);//Parse Uri + )); + } + + public static function pathNotFound($function){ + self::$pathNotFound = $function; + } + + public static function methodNotAllowed($function){ + self::$methodNotAllowed = $function; + } + + public static function run($basepath = '/'){ + + // Parse current url + $parsed_url = parse_url($_SERVER['REQUEST_URI']);//Parse Uri + + if(isset($parsed_url['path'])){ + $path = $parsed_url['path']; + }else{ + $path = '/'; + } - if(isset($parsed_url['path'])){ - $path = $parsed_url['path']; - }else{ - $path = '/'; - } - // Get current request method $method = $_SERVER['REQUEST_METHOD']; - - $path_match_found = false; - + + $path_match_found = false; + $route_match_found = false; - - foreach(self::$routes as $route){ + + foreach(self::$routes as $route){ // If the method matches check the path - + // Add basepath to matching string if($basepath!=''&&$basepath!='/'){ $route['expression'] = '('.$basepath.')'.$route['expression']; } - + // Add 'find string start' automatically $route['expression'] = '^'.$route['expression']; - + // Add 'find string end' automatically $route['expression'] = $route['expression'].'$'; - + // echo $route['expression'].'
'; - + // Check path match if(preg_match('#'.$route['expression'].'#',$path,$matches)){ - + $path_match_found = true; - + // Check method match if(strtolower($method) == strtolower($route['method'])){ - + array_shift($matches);// Always remove first element. This contains the whole string - + if($basepath!=''&&$basepath!='/'){ array_shift($matches);// Remove basepath } - + call_user_func_array($route['function'], $matches); - + $route_match_found = true; - + // Do not check other routes break; } - } - } - + } + } + // No matching route was found - if(!$route_match_found){ - + if(!$route_match_found){ + // But a matching path exists if($path_match_found){ header("HTTP/1.0 405 Method Not Allowed"); @@ -96,9 +96,9 @@ class Route{ call_user_func_array(self::$pathNotFound, Array($path)); } } - - } - - } - -} \ No newline at end of file + + } + + } + +}