@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | |
| 264 | 264 | // Save status code in Output object |
| 265 | 265 | // added by ci-phpunit-test |
| 266 | - $CI =& get_instance(); |
|
| 266 | + $CI = & get_instance(); |
|
| 267 | 267 | $output = $CI->output; |
| 268 | 268 | $output->_status = [ |
| 269 | 269 | 'code' => $code, |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | if (empty($_config)) |
| 377 | 377 | { |
| 378 | 378 | // references cannot be directly assigned to static variables, so we use an array |
| 379 | - $_config[0] =& get_config(); |
|
| 379 | + $_config[0] = & get_config(); |
|
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | return isset($_config[0][$item]) ? $_config[0][$item] : NULL; |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | * Start the timer... tick tock tick tock... |
| 186 | 186 | * ------------------------------------------------------ |
| 187 | 187 | */ |
| 188 | - $BM =& load_class('Benchmark', 'core'); |
|
| 188 | + $BM = & load_class('Benchmark', 'core'); |
|
| 189 | 189 | CIPHPUnitTestSuperGlobal::set_Global('BM', $BM); |
| 190 | 190 | $BM->mark('total_execution_time_start'); |
| 191 | 191 | $BM->mark('loading_time:_base_classes_start'); |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | * Instantiate the hooks class |
| 196 | 196 | * ------------------------------------------------------ |
| 197 | 197 | */ |
| 198 | - $EXT =& load_class('Hooks', 'core'); |
|
| 198 | + $EXT = & load_class('Hooks', 'core'); |
|
| 199 | 199 | CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT); |
| 200 | 200 | |
| 201 | 201 | /* |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | * depending on another class that uses it. |
| 216 | 216 | * |
| 217 | 217 | */ |
| 218 | - $CFG =& load_class('Config', 'core'); |
|
| 218 | + $CFG = & load_class('Config', 'core'); |
|
| 219 | 219 | CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG); |
| 220 | 220 | |
| 221 | 221 | // Do we have any manually set config items in the index.php file? |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | * Instantiate the UTF-8 class |
| 295 | 295 | * ------------------------------------------------------ |
| 296 | 296 | */ |
| 297 | - $UNI =& load_class('Utf8', 'core'); |
|
| 297 | + $UNI = & load_class('Utf8', 'core'); |
|
| 298 | 298 | CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI); |
| 299 | 299 | |
| 300 | 300 | /* |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | * Instantiate the URI class |
| 303 | 303 | * ------------------------------------------------------ |
| 304 | 304 | */ |
| 305 | - $URI =& load_class('URI', 'core'); |
|
| 305 | + $URI = & load_class('URI', 'core'); |
|
| 306 | 306 | CIPHPUnitTestSuperGlobal::set_Global('URI', $URI); |
| 307 | 307 | |
| 308 | 308 | /* |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | * Instantiate the routing class and set the routing |
| 311 | 311 | * ------------------------------------------------------ |
| 312 | 312 | */ |
| 313 | - $RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL); |
|
| 313 | + $RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL); |
|
| 314 | 314 | CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR); |
| 315 | 315 | |
| 316 | 316 | /* |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | * Instantiate the output class |
| 319 | 319 | * ------------------------------------------------------ |
| 320 | 320 | */ |
| 321 | - $OUT =& load_class('Output', 'core'); |
|
| 321 | + $OUT = & load_class('Output', 'core'); |
|
| 322 | 322 | CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT); |
| 323 | 323 | |
| 324 | 324 | /* |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | * Load the security class for xss and csrf support |
| 337 | 337 | * ----------------------------------------------------- |
| 338 | 338 | */ |
| 339 | - $SEC =& load_class('Security', 'core'); |
|
| 339 | + $SEC = & load_class('Security', 'core'); |
|
| 340 | 340 | CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC); |
| 341 | 341 | |
| 342 | 342 | /* |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | * Load the Input class and sanitize globals |
| 345 | 345 | * ------------------------------------------------------ |
| 346 | 346 | */ |
| 347 | - $IN =& load_class('Input', 'core'); |
|
| 347 | + $IN = & load_class('Input', 'core'); |
|
| 348 | 348 | CIPHPUnitTestSuperGlobal::set_Global('IN', $IN); |
| 349 | 349 | |
| 350 | 350 | /* |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | * Load the Language class |
| 353 | 353 | * ------------------------------------------------------ |
| 354 | 354 | */ |
| 355 | - $LANG =& load_class('Lang', 'core'); |
|
| 355 | + $LANG = & load_class('Lang', 'core'); |
|
| 356 | 356 | CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG); |
| 357 | 357 | |
| 358 | 358 | /* |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | */ |
| 376 | 376 | function &get_instance() |
| 377 | 377 | { |
| 378 | - if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
|
| 378 | + if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
|
| 379 | 379 | { |
| 380 | 380 | return CI_Controller::get_instance(); |
| 381 | 381 | } |
@@ -63,63 +63,63 @@ discard block |
||
| 63 | 63 | * |
| 64 | 64 | * @var array |
| 65 | 65 | */ |
| 66 | - protected $_ci_view_paths = array(VIEWPATH => TRUE); |
|
| 66 | + protected $_ci_view_paths = array(VIEWPATH => TRUE); |
|
| 67 | 67 | |
| 68 | 68 | /** |
| 69 | 69 | * List of paths to load libraries from |
| 70 | 70 | * |
| 71 | 71 | * @var array |
| 72 | 72 | */ |
| 73 | - protected $_ci_library_paths = array(APPPATH, BASEPATH); |
|
| 73 | + protected $_ci_library_paths = array(APPPATH, BASEPATH); |
|
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | 76 | * List of paths to load models from |
| 77 | 77 | * |
| 78 | 78 | * @var array |
| 79 | 79 | */ |
| 80 | - protected $_ci_model_paths = array(APPPATH); |
|
| 80 | + protected $_ci_model_paths = array(APPPATH); |
|
| 81 | 81 | |
| 82 | 82 | /** |
| 83 | 83 | * List of paths to load helpers from |
| 84 | 84 | * |
| 85 | 85 | * @var array |
| 86 | 86 | */ |
| 87 | - protected $_ci_helper_paths = array(APPPATH, BASEPATH); |
|
| 87 | + protected $_ci_helper_paths = array(APPPATH, BASEPATH); |
|
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | 90 | * List of cached variables |
| 91 | 91 | * |
| 92 | 92 | * @var array |
| 93 | 93 | */ |
| 94 | - protected $_ci_cached_vars = array(); |
|
| 94 | + protected $_ci_cached_vars = array(); |
|
| 95 | 95 | |
| 96 | 96 | /** |
| 97 | 97 | * List of loaded classes |
| 98 | 98 | * |
| 99 | 99 | * @var array |
| 100 | 100 | */ |
| 101 | - protected $_ci_classes = array(); |
|
| 101 | + protected $_ci_classes = array(); |
|
| 102 | 102 | |
| 103 | 103 | /** |
| 104 | 104 | * List of loaded models |
| 105 | 105 | * |
| 106 | 106 | * @var array |
| 107 | 107 | */ |
| 108 | - protected $_ci_models = array(); |
|
| 108 | + protected $_ci_models = array(); |
|
| 109 | 109 | |
| 110 | 110 | /** |
| 111 | 111 | * List of loaded helpers |
| 112 | 112 | * |
| 113 | 113 | * @var array |
| 114 | 114 | */ |
| 115 | - protected $_ci_helpers = array(); |
|
| 115 | + protected $_ci_helpers = array(); |
|
| 116 | 116 | |
| 117 | 117 | /** |
| 118 | 118 | * List of class name mappings |
| 119 | 119 | * |
| 120 | 120 | * @var array |
| 121 | 121 | */ |
| 122 | - protected $_ci_varmap = array( |
|
| 122 | + protected $_ci_varmap = array( |
|
| 123 | 123 | 'unit_test' => 'unit', |
| 124 | 124 | 'user_agent' => 'agent' |
| 125 | 125 | ); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | public function __construct() |
| 139 | 139 | { |
| 140 | 140 | $this->_ci_ob_level = ob_get_level(); |
| 141 | - $this->_ci_classes =& is_loaded(); |
|
| 141 | + $this->_ci_classes = & is_loaded(); |
|
| 142 | 142 | |
| 143 | 143 | log_message('info', 'Loader Class Initialized'); |
| 144 | 144 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | return $this; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | - $CI =& get_instance(); |
|
| 282 | + $CI = & get_instance(); |
|
| 283 | 283 | if (isset($CI->$name)) |
| 284 | 284 | { |
| 285 | 285 | throw new RuntimeException('The model name you are loading is the name of a resource that is already being used: '.$name); |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | public function database($params = '', $return = FALSE, $query_builder = NULL) |
| 383 | 383 | { |
| 384 | 384 | // Grab the super object |
| 385 | - $CI =& get_instance(); |
|
| 385 | + $CI = & get_instance(); |
|
| 386 | 386 | |
| 387 | 387 | // Do we even need to load the database class? |
| 388 | 388 | if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id)) |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | $CI->db = ''; |
| 403 | 403 | |
| 404 | 404 | // Load the DB class |
| 405 | - $CI->db =& DB($params, $query_builder); |
|
| 405 | + $CI->db = & DB($params, $query_builder); |
|
| 406 | 406 | return $this; |
| 407 | 407 | } |
| 408 | 408 | |
@@ -419,12 +419,12 @@ discard block |
||
| 419 | 419 | */ |
| 420 | 420 | public function dbutil($db = NULL, $return = FALSE) |
| 421 | 421 | { |
| 422 | - $CI =& get_instance(); |
|
| 422 | + $CI = & get_instance(); |
|
| 423 | 423 | |
| 424 | 424 | if ( ! is_object($db) OR ! ($db instanceof CI_DB)) |
| 425 | 425 | { |
| 426 | 426 | class_exists('CI_DB', FALSE) OR $this->database(); |
| 427 | - $db =& $CI->db; |
|
| 427 | + $db = & $CI->db; |
|
| 428 | 428 | } |
| 429 | 429 | |
| 430 | 430 | require_once(BASEPATH.'database/DB_utility.php'); |
@@ -453,11 +453,11 @@ discard block |
||
| 453 | 453 | */ |
| 454 | 454 | public function dbforge($db = NULL, $return = FALSE) |
| 455 | 455 | { |
| 456 | - $CI =& get_instance(); |
|
| 456 | + $CI = & get_instance(); |
|
| 457 | 457 | if ( ! is_object($db) OR ! ($db instanceof CI_DB)) |
| 458 | 458 | { |
| 459 | 459 | class_exists('CI_DB', FALSE) OR $this->database(); |
| 460 | - $db =& $CI->db; |
|
| 460 | + $db = & $CI->db; |
|
| 461 | 461 | } |
| 462 | 462 | |
| 463 | 463 | require_once(BASEPATH.'database/DB_forge.php'); |
@@ -821,7 +821,7 @@ discard block |
||
| 821 | 821 | $this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths; |
| 822 | 822 | |
| 823 | 823 | // Add config file path |
| 824 | - $config =& $this->_ci_get_component('config'); |
|
| 824 | + $config = & $this->_ci_get_component('config'); |
|
| 825 | 825 | $config->_config_paths[] = $path; |
| 826 | 826 | |
| 827 | 827 | return $this; |
@@ -860,7 +860,7 @@ discard block |
||
| 860 | 860 | */ |
| 861 | 861 | public function remove_package_path($path = '') |
| 862 | 862 | { |
| 863 | - $config =& $this->_ci_get_component('config'); |
|
| 863 | + $config = & $this->_ci_get_component('config'); |
|
| 864 | 864 | |
| 865 | 865 | if ($path === '') |
| 866 | 866 | { |
@@ -963,12 +963,12 @@ discard block |
||
| 963 | 963 | |
| 964 | 964 | // This allows anything loaded using $this->load (views, files, etc.) |
| 965 | 965 | // to become accessible from within the Controller and Model functions. |
| 966 | - $_ci_CI =& get_instance(); |
|
| 966 | + $_ci_CI = & get_instance(); |
|
| 967 | 967 | foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var) |
| 968 | 968 | { |
| 969 | 969 | if ( ! isset($this->$_ci_key)) |
| 970 | 970 | { |
| 971 | - $this->$_ci_key =& $_ci_CI->$_ci_key; |
|
| 971 | + $this->$_ci_key = & $_ci_CI->$_ci_key; |
|
| 972 | 972 | } |
| 973 | 973 | } |
| 974 | 974 | |
@@ -1110,7 +1110,7 @@ discard block |
||
| 1110 | 1110 | // return a new instance of the object |
| 1111 | 1111 | if ($object_name !== NULL) |
| 1112 | 1112 | { |
| 1113 | - $CI =& get_instance(); |
|
| 1113 | + $CI = & get_instance(); |
|
| 1114 | 1114 | if ( ! isset($CI->$object_name)) |
| 1115 | 1115 | { |
| 1116 | 1116 | return $this->_ci_init_library($class, '', $params, $object_name); |
@@ -1173,7 +1173,7 @@ discard block |
||
| 1173 | 1173 | // return a new instance of the object |
| 1174 | 1174 | if ($object_name !== NULL) |
| 1175 | 1175 | { |
| 1176 | - $CI =& get_instance(); |
|
| 1176 | + $CI = & get_instance(); |
|
| 1177 | 1177 | if ( ! isset($CI->$object_name)) |
| 1178 | 1178 | { |
| 1179 | 1179 | return $this->_ci_init_library($library_name, $prefix, $params, $object_name); |
@@ -1326,7 +1326,7 @@ discard block |
||
| 1326 | 1326 | } |
| 1327 | 1327 | |
| 1328 | 1328 | // Don't overwrite existing properties |
| 1329 | - $CI =& get_instance(); |
|
| 1329 | + $CI = & get_instance(); |
|
| 1330 | 1330 | if (isset($CI->$object_name)) |
| 1331 | 1331 | { |
| 1332 | 1332 | if ($CI->$object_name instanceof $class_name) |
@@ -1477,7 +1477,7 @@ discard block |
||
| 1477 | 1477 | */ |
| 1478 | 1478 | protected function &_ci_get_component($component) |
| 1479 | 1479 | { |
| 1480 | - $CI =& get_instance(); |
|
| 1480 | + $CI = & get_instance(); |
|
| 1481 | 1481 | return $CI->$component; |
| 1482 | 1482 | } |
| 1483 | 1483 | } |
@@ -137,17 +137,17 @@ discard block |
||
| 137 | 137 | */ |
| 138 | 138 | public function __construct() |
| 139 | 139 | { |
| 140 | - $this->_allow_get_array = (config_item('allow_get_array') === TRUE); |
|
| 141 | - $this->_enable_xss = (config_item('global_xss_filtering') === TRUE); |
|
| 142 | - $this->_enable_csrf = (config_item('csrf_protection') === TRUE); |
|
| 143 | - $this->_standardize_newlines = (bool) config_item('standardize_newlines'); |
|
| 140 | + $this->_allow_get_array = (config_item('allow_get_array') === TRUE); |
|
| 141 | + $this->_enable_xss = (config_item('global_xss_filtering') === TRUE); |
|
| 142 | + $this->_enable_csrf = (config_item('csrf_protection') === TRUE); |
|
| 143 | + $this->_standardize_newlines = (bool) config_item('standardize_newlines'); |
|
| 144 | 144 | |
| 145 | - $this->security =& load_class('Security', 'core'); |
|
| 145 | + $this->security = & load_class('Security', 'core'); |
|
| 146 | 146 | |
| 147 | 147 | // Do we need the UTF-8 class? |
| 148 | 148 | if (UTF8_ENABLED === TRUE) |
| 149 | 149 | { |
| 150 | - $this->uni =& load_class('Utf8', 'core'); |
|
| 150 | + $this->uni = & load_class('Utf8', 'core'); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | // Sanitize global arrays |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | |
| 414 | 414 | // Save cookie in Output object |
| 415 | 415 | // added by ci-phpunit-test |
| 416 | - $CI =& get_instance(); |
|
| 416 | + $CI = & get_instance(); |
|
| 417 | 417 | $output = $CI->output; |
| 418 | 418 | $output->_cookies[$prefix.$name][] = [ |
| 419 | 419 | 'value' => $value, |
@@ -9,10 +9,10 @@ discard block |
||
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | // Autoloader for ci-phpunit-test |
| 12 | -require __DIR__ . '/CIPHPUnitTestAutoloader.php'; |
|
| 13 | -require __DIR__ . '/CIPHPUnitTestFileCache.php'; |
|
| 12 | +require __DIR__.'/CIPHPUnitTestAutoloader.php'; |
|
| 13 | +require __DIR__.'/CIPHPUnitTestFileCache.php'; |
|
| 14 | 14 | $cache = new CIPHPUnitTestFileCache( |
| 15 | - __DIR__ . '/tmp/cache/autoload.php' |
|
| 15 | + __DIR__.'/tmp/cache/autoload.php' |
|
| 16 | 16 | ); |
| 17 | 17 | $autoload_dirs = CIPHPUnitTest::getAutoloadDirs(); |
| 18 | 18 | $autoloader = new CIPHPUnitTestAutoloader($cache, $autoload_dirs); |
@@ -20,5 +20,5 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | // Register CodeIgniter's tests/mocks/autoloader.php |
| 22 | 22 | define('SYSTEM_PATH', BASEPATH); |
| 23 | -require TESTPATH .'mocks/autoloader.php'; |
|
| 23 | +require TESTPATH.'mocks/autoloader.php'; |
|
| 24 | 24 | spl_autoload_register('autoload'); |
@@ -33,30 +33,30 @@ discard block |
||
| 33 | 33 | $cwd_backup = getcwd(); |
| 34 | 34 | |
| 35 | 35 | // Load autoloader for ci-phpunit-test |
| 36 | - require __DIR__ . '/autoloader.php'; |
|
| 36 | + require __DIR__.'/autoloader.php'; |
|
| 37 | 37 | |
| 38 | - require TESTPATH . 'TestCase.php'; |
|
| 38 | + require TESTPATH.'TestCase.php'; |
|
| 39 | 39 | |
| 40 | - $db_test_case_file = TESTPATH . 'DbTestCase.php'; |
|
| 40 | + $db_test_case_file = TESTPATH.'DbTestCase.php'; |
|
| 41 | 41 | if (is_readable($db_test_case_file)) |
| 42 | 42 | { |
| 43 | 43 | require $db_test_case_file; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | // Replace a few Common functions |
| 47 | - require __DIR__ . '/replacing/core/Common.php'; |
|
| 48 | - require BASEPATH . 'core/Common.php'; |
|
| 47 | + require __DIR__.'/replacing/core/Common.php'; |
|
| 48 | + require BASEPATH.'core/Common.php'; |
|
| 49 | 49 | |
| 50 | 50 | // Workaround for missing CodeIgniter's error handler |
| 51 | 51 | // See https://github.com/kenjis/ci-phpunit-test/issues/37 |
| 52 | 52 | set_error_handler('_error_handler'); |
| 53 | 53 | |
| 54 | 54 | // Load new functions of CIPHPUnitTest |
| 55 | - require __DIR__ . '/functions.php'; |
|
| 55 | + require __DIR__.'/functions.php'; |
|
| 56 | 56 | // Load ci-phpunit-test CI_Loader |
| 57 | - require __DIR__ . '/replacing/core/Loader.php'; |
|
| 57 | + require __DIR__.'/replacing/core/Loader.php'; |
|
| 58 | 58 | // Load ci-phpunit-test CI_Input |
| 59 | - require __DIR__ . '/replacing/core/Input.php'; |
|
| 59 | + require __DIR__.'/replacing/core/Input.php'; |
|
| 60 | 60 | |
| 61 | 61 | // Change current directory |
| 62 | 62 | chdir(FCPATH); |
@@ -68,12 +68,12 @@ discard block |
||
| 68 | 68 | * |
| 69 | 69 | * And away we go... |
| 70 | 70 | */ |
| 71 | - require __DIR__ . '/replacing/core/CodeIgniter.php'; |
|
| 71 | + require __DIR__.'/replacing/core/CodeIgniter.php'; |
|
| 72 | 72 | |
| 73 | 73 | self::replaceHelpers(); |
| 74 | 74 | |
| 75 | 75 | // Create CodeIgniter instance |
| 76 | - if (! self::wiredesignzHmvcInstalled()) |
|
| 76 | + if ( ! self::wiredesignzHmvcInstalled()) |
|
| 77 | 77 | { |
| 78 | 78 | new CI_Controller(); |
| 79 | 79 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | public static function createCodeIgniterInstance() |
| 96 | 96 | { |
| 97 | - if (! self::wiredesignzHmvcInstalled()) |
|
| 97 | + if ( ! self::wiredesignzHmvcInstalled()) |
|
| 98 | 98 | { |
| 99 | 99 | new CI_Controller(); |
| 100 | 100 | } |
@@ -123,11 +123,11 @@ discard block |
||
| 123 | 123 | protected static function replaceLoader() |
| 124 | 124 | { |
| 125 | 125 | $my_loader_file = |
| 126 | - APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php'; |
|
| 126 | + APPPATH.'core/'.config_item('subclass_prefix').'Loader.php'; |
|
| 127 | 127 | |
| 128 | 128 | if (file_exists($my_loader_file)) |
| 129 | 129 | { |
| 130 | - self::$loader_class = config_item('subclass_prefix') . 'Loader'; |
|
| 130 | + self::$loader_class = config_item('subclass_prefix').'Loader'; |
|
| 131 | 131 | if ( ! class_exists(self::$loader_class)) |
| 132 | 132 | { |
| 133 | 133 | require $my_loader_file; |
@@ -146,19 +146,19 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | protected static function loadHelper($helper) |
| 148 | 148 | { |
| 149 | - $my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php'; |
|
| 149 | + $my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php'; |
|
| 150 | 150 | if (file_exists($my_helper_file)) |
| 151 | 151 | { |
| 152 | 152 | require $my_helper_file; |
| 153 | 153 | } |
| 154 | - require __DIR__ . '/replacing/helpers/' . $helper . '.php'; |
|
| 154 | + require __DIR__.'/replacing/helpers/'.$helper.'.php'; |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | public static function setPatcherCacheDir($dir = null) |
| 158 | 158 | { |
| 159 | 159 | if ($dir === null) |
| 160 | 160 | { |
| 161 | - $dir = TESTPATH . '_ci_phpunit_test/tmp/cache'; |
|
| 161 | + $dir = TESTPATH.'_ci_phpunit_test/tmp/cache'; |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | MonkeyPatchManager::setCacheDir( |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * NOTE: If you change these, also change the error_reporting() code below |
| 55 | 55 | */ |
| 56 | 56 | // This `if` statemant is needed for @runInSeparateProcess |
| 57 | -if (! defined('ENVIRONMENT')) |
|
| 57 | +if ( ! defined('ENVIRONMENT')) |
|
| 58 | 58 | { |
| 59 | 59 | define('ENVIRONMENT', 'testing'); |
| 60 | 60 | } |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME)); |
| 234 | 234 | |
| 235 | 235 | // Path to the test directory containing all the test files. |
| 236 | - define('TESTPATH', __dir__.DIRECTORY_SEPARATOR); // Should be the folder this `Bootstrap.php` file is in. |
|
| 236 | + define('TESTPATH', __dir__.DIRECTORY_SEPARATOR); // Should be the folder this `Bootstrap.php` file is in. |
|
| 237 | 237 | |
| 238 | 238 | // Path to the system directory |
| 239 | 239 | define('BASEPATH', $system_path); |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | * Added for ci-phpunit-test |
| 361 | 361 | * ------------------------------------------------------------------- |
| 362 | 362 | */ |
| 363 | -require __DIR__ . '/_ci_phpunit_test/CIPHPUnitTest.php'; |
|
| 363 | +require __DIR__.'/_ci_phpunit_test/CIPHPUnitTest.php'; |
|
| 364 | 364 | CIPHPUnitTest::init(); |
| 365 | 365 | /* |
| 366 | 366 | * Or you can set directories for autoloading |