diff --git a/application/module/core/generator/Routes.php b/application/module/core/generator/Routes.php index ffd2bb5..bba3420 100755 --- a/application/module/core/generator/Routes.php +++ b/application/module/core/generator/Routes.php @@ -12,7 +12,7 @@ RouteCollection::cli('/core/purge/[h:module]', function($module){ }); RouteCollection::cli('/core/routes', function(){ - foreach(RouteCollection::return_routes() as $route){ + foreach(RouteCollection::returnRoutes() as $route){ echo str_pad( implode(',', $route->_verb), 10) . "| $route->_uri \n"; } }); diff --git a/application/module/core/sanity/Routes.php b/application/module/core/sanity/Routes.php index 537136c..68fbe89 100755 --- a/application/module/core/sanity/Routes.php +++ b/application/module/core/sanity/Routes.php @@ -12,7 +12,7 @@ RouteCollection::cli('sanity/install', function() { Migrator::getInstance()->execute_plan(); Wrapper::commit(); -})->middleware_ignore('auth'); +})->middlewareIgnore('auth'); RouteCollection::add('*', '*', function() { @@ -20,8 +20,8 @@ RouteCollection::add('*', '*', function() { if(INSTALL_REQUIRE){ //App need to be installed if (!is_file(DIR_CONFIG . 'modules.ini')) { - $ROUTE->do_block()->set_http_error(500); + $ROUTE->doBlock()->setHttpError(500); } } -}, -19)->do_ignore()->middleware_ignore('auth'); \ No newline at end of file +}, -19)->doIgnore()->middlewareIgnore('auth'); \ No newline at end of file diff --git a/application/module/core/template/Routes.php b/application/module/core/template/Routes.php index ee74112..6296ecf 100755 --- a/application/module/core/template/Routes.php +++ b/application/module/core/template/Routes.php @@ -14,4 +14,4 @@ RouteCollection::get('*', function(){ $OUTPUT = Output::getInstance(); -}, -11)->do_ignore(); \ No newline at end of file +}, -11)->doIgnore(); \ No newline at end of file diff --git a/bootstrap.php b/bootstrap.php index 59f9888..7e9398a 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -12,5 +12,5 @@ use Routes\RouteCollection as RouteCollection; Lang::buildStrings(); -RouteCollection::getInstance()->crawl(__DIR__.'/application')->load_routes(); +RouteCollection::getInstance()->crawl(__DIR__.'/application')->loadRoutes(); RouteCollection::getInstance()->submit();