From 140681593c7f99ec0043b8efe1c8bd1c85998f1f Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 25 Oct 2017 08:35:17 +0200 Subject: [PATCH] Cleaned up code --- Route.php | 14 +++++++------- index.php | 12 +++++++++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Route.php b/Route.php index 135eb92..cdd3dde 100644 --- a/Route.php +++ b/Route.php @@ -15,7 +15,7 @@ class Route{ }else{ self::$path = '/'; } - + } public static function add($expression,$function){ @@ -41,11 +41,11 @@ class Route{ if(Config::get('basepath')){ - //Add / if its not empty - if($route['expression']!=''){ - $route['expression'] = '/'.$route['expression']; - } - + //Add / if its not empty + if($route['expression']!=''){ + $route['expression'] = '/'.$route['expression']; + } + $route['expression'] = '('.Config::get('basepath').')'.$route['expression']; } @@ -56,7 +56,7 @@ class Route{ //Add 'find string end' automatically $route['expression'] = $route['expression'].'$'; - //echo $route['expression'].'
'; + //echo $route['expression'].'
'; //check match if(preg_match('#'.$route['expression'].'#',self::$path,$matches)){ diff --git a/index.php b/index.php index 813d5ef..e8cc366 100644 --- a/index.php +++ b/index.php @@ -5,7 +5,7 @@ include('Config.php'); include('Route.php'); //config -Config::set('basepath',''); +Config::set('basepath','/api/v1'); //init routing Route::init(); @@ -52,6 +52,16 @@ Route::add('/(.*)/(.*)/(.*)/(.*)',function($var1,$var2,$var3,$var4){ echo 'You have entered: '.$var1.' / '.$var2.' / '.$var3.' / '.$var4.'
'; }); +Route::add('/api/v1/deployment/(.*)',function($id){ + //Do something + echo $id; +}); + +Route::add('/deployment/(.*)',function($id){ + //Do something + echo $id; +}); + //Add a 404 Not found Route Route::add404(function($url){