From 000850de5c4e6063ce26a6107d1c9fb035f504b7 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Mon, 21 May 2012 15:24:36 -0400 Subject: [PATCH] Fix tests --- sys/common.php | 12 ++++++------ sys/db | 2 +- tests/index.php | 4 ---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/sys/common.php b/sys/common.php index 15187a9..7e3da83 100644 --- a/sys/common.php +++ b/sys/common.php @@ -325,12 +325,6 @@ function init() // Load Database classes require_once(MM_SYS_PATH . 'db/autoload.php'); - // Load system libraries/traits - spl_autoload_register('sys_autoload'); - - // Start the library autoloader - spl_autoload_register('autoload'); - // Map to the appropriate module/controller/function route(); } @@ -467,4 +461,10 @@ function route() show_404(); } +// Load system libraries/traits +spl_autoload_register('sys_autoload'); + +// Start the library autoloader +spl_autoload_register('autoload'); + // End of common.php \ No newline at end of file diff --git a/sys/db b/sys/db index f555b17..2c67dd0 160000 --- a/sys/db +++ b/sys/db @@ -1 +1 @@ -Subproject commit f555b179b4d025316bb87cfe44c18f5593507b70 +Subproject commit 2c67dd03cc917bd0f83cfc53923f4e009edc39c5 diff --git a/tests/index.php b/tests/index.php index f4e148f..513119c 100644 --- a/tests/index.php +++ b/tests/index.php @@ -19,10 +19,6 @@ require_once(MM_SYS_PATH . 'db/tests/index.php'); //Include src files require_once(MM_SYS_PATH . 'common.php'); -require_once(MM_SYS_PATH . 'core/traits.php'); -require_once(MM_SYS_PATH . 'core/MM.php'); -require_once(MM_SYS_PATH . 'core/miniMVC.php'); -array_map('do_include', glob(MM_SYS_PATH . 'core/*.php')); //Include test files require_once('commonTest.php');