kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updates bootstrap 

Adds a THROW_EXCEPTION const
Force connect the db as otherwise mysql_escape fails
This commit is contained in:
alban 2014-03-22 15:39:37 +01:00
parent d20227a44e
commit b26fc42ac4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpunit/bootstrap.php
View File

@ -17,7 +17,8 @@ AutoLoader::registerDirectory('lib');
AutoLoader::registerDirectory('../bureau/class'); AutoLoader::registerDirectory('../bureau/class');
AutoLoader::registerDirectory('.'); AutoLoader::registerDirectory('.');
define('ALTERNC_PANEL', "../bureau"); // Custom define('ALTERNC_PANEL',realpath(__DIR__."/../bureau"));; // Custom
define('PHPUNIT_DATASETS_PATH',realpath(__DIR__."/tests/_datasets"));
require_once ALTERNC_PANEL."/class/db_mysql.php"; require_once ALTERNC_PANEL."/class/db_mysql.php";
require_once ALTERNC_PANEL."/class/functions.php"; require_once ALTERNC_PANEL."/class/functions.php";
@ -66,6 +67,7 @@ define('ALTERNC_APACHE2_GEN_TMPL_DIR', '/etc/alternc/templates/apache2/');
define('ALTERNC_VHOST_DIR', "/var/lib/alternc/apache-vhost/"); define('ALTERNC_VHOST_DIR', "/var/lib/alternc/apache-vhost/");
define('ALTERNC_VHOST_FILE', ALTERNC_VHOST_DIR."vhosts_all.conf"); define('ALTERNC_VHOST_FILE', ALTERNC_VHOST_DIR."vhosts_all.conf");
define('ALTERNC_VHOST_MANUALCONF', ALTERNC_VHOST_DIR."manual/"); define('ALTERNC_VHOST_MANUALCONF', ALTERNC_VHOST_DIR."manual/");
define("THROW_EXCEPTIONS", TRUE);
$root = ALTERNC_PANEL."/"; $root = ALTERNC_PANEL."/";
// Create test directory // Create test directory
@ -144,6 +146,7 @@ foreach ($queryList as $exec_command) {
} }
} }
$db = new \DB_system($user,$database,$password); $db = new \DB_system($user,$database,$password);
$db->connect();
$cuid = 0; $cuid = 0;
$variables = new \m_variables(); $variables = new \m_variables();
$mem = new \m_mem(); $mem = new \m_mem();