@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | reset_config(); |
| 33 | 33 | |
| 34 | 34 | // Close db connection |
| 35 | - $CI =& get_instance(); |
|
| 35 | + $CI = & get_instance(); |
|
| 36 | 36 | if (isset($CI->db) && $CI->db instanceof CI_DB) |
| 37 | 37 | { |
| 38 | 38 | if ( |
@@ -52,25 +52,25 @@ discard block |
||
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | // Load core classes |
| 55 | - $BM =& load_class('Benchmark', 'core'); |
|
| 55 | + $BM = & load_class('Benchmark', 'core'); |
|
| 56 | 56 | CIPHPUnitTestSuperGlobal::set_Global('BM', $BM); |
| 57 | - $EXT =& load_class('Hooks', 'core'); |
|
| 57 | + $EXT = & load_class('Hooks', 'core'); |
|
| 58 | 58 | CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT); |
| 59 | - $CFG =& load_class('Config', 'core'); |
|
| 59 | + $CFG = & load_class('Config', 'core'); |
|
| 60 | 60 | CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG); |
| 61 | - $UNI =& load_class('URI', 'core'); |
|
| 61 | + $UNI = & load_class('URI', 'core'); |
|
| 62 | 62 | CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI); |
| 63 | 63 | // $URI =& load_class('Utf8', 'core'); |
| 64 | 64 | // CIPHPUnitTestSuperGlobal::set_Global('URI', $URI); |
| 65 | - $RTR =& load_class('Router', 'core'); |
|
| 65 | + $RTR = & load_class('Router', 'core'); |
|
| 66 | 66 | CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR); |
| 67 | - $OUT =& load_class('Output', 'core'); |
|
| 67 | + $OUT = & load_class('Output', 'core'); |
|
| 68 | 68 | CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT); |
| 69 | - $SEC =& load_class('Security', 'core'); |
|
| 69 | + $SEC = & load_class('Security', 'core'); |
|
| 70 | 70 | CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC); |
| 71 | - $IN =& load_class('Input', 'core'); |
|
| 71 | + $IN = & load_class('Input', 'core'); |
|
| 72 | 72 | CIPHPUnitTestSuperGlobal::set_Global('IN', $IN); |
| 73 | - $LANG =& load_class('Lang', 'core'); |
|
| 73 | + $LANG = & load_class('Lang', 'core'); |
|
| 74 | 74 | CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG); |
| 75 | 75 | |
| 76 | 76 | CIPHPUnitTest::loadLoader(); |
@@ -42,8 +42,7 @@ |
||
| 42 | 42 | { |
| 43 | 43 | CIPHPUnitTestDbConnectionStore::close($CI->db); |
| 44 | 44 | $CI->db = null; |
| 45 | - } |
|
| 46 | - else |
|
| 45 | + } else |
|
| 47 | 46 | { |
| 48 | 47 | // Don't close if SQLite in-memory database |
| 49 | 48 | // If we close it, all tables and stored data will be gone |