@@ -20,7 +20,7 @@ |
||
20 | 20 | { |
21 | 21 | reset_instance(); |
22 | 22 | $controller = new $classname; |
23 | - $this->CI =& get_instance(); |
|
23 | + $this->CI = & get_instance(); |
|
24 | 24 | return $controller; |
25 | 25 | } |
26 | 26 |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | */ |
21 | 21 | public static function init(array $autoload_dirs = null) |
22 | 22 | { |
23 | - if (! defined('TESTPATH')) { |
|
23 | + if ( ! defined('TESTPATH')) { |
|
24 | 24 | define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR); |
25 | 25 | } |
26 | 26 | |
@@ -37,36 +37,36 @@ discard block |
||
37 | 37 | $cwd_backup = getcwd(); |
38 | 38 | |
39 | 39 | // Load autoloader for ci-phpunit-test |
40 | - require __DIR__ . '/autoloader.php'; |
|
40 | + require __DIR__.'/autoloader.php'; |
|
41 | 41 | |
42 | - require TESTPATH . 'TestCase.php'; |
|
42 | + require TESTPATH.'TestCase.php'; |
|
43 | 43 | |
44 | - $db_test_case_file = TESTPATH . 'DbTestCase.php'; |
|
44 | + $db_test_case_file = TESTPATH.'DbTestCase.php'; |
|
45 | 45 | if (is_readable($db_test_case_file)) |
46 | 46 | { |
47 | 47 | require $db_test_case_file; |
48 | 48 | } |
49 | 49 | |
50 | - $unit_test_case_file = TESTPATH . 'UnitTestCase.php'; |
|
50 | + $unit_test_case_file = TESTPATH.'UnitTestCase.php'; |
|
51 | 51 | if (is_readable($unit_test_case_file)) |
52 | 52 | { |
53 | 53 | require $unit_test_case_file; |
54 | 54 | } |
55 | 55 | |
56 | 56 | // Replace a few Common functions |
57 | - require __DIR__ . '/replacing/core/Common.php'; |
|
58 | - require BASEPATH . 'core/Common.php'; |
|
57 | + require __DIR__.'/replacing/core/Common.php'; |
|
58 | + require BASEPATH.'core/Common.php'; |
|
59 | 59 | |
60 | 60 | // Workaround for missing CodeIgniter's error handler |
61 | 61 | // See https://github.com/kenjis/ci-phpunit-test/issues/37 |
62 | 62 | set_error_handler('_error_handler'); |
63 | 63 | |
64 | 64 | // Load new functions of CIPHPUnitTest |
65 | - require __DIR__ . '/functions.php'; |
|
65 | + require __DIR__.'/functions.php'; |
|
66 | 66 | // Load ci-phpunit-test CI_Loader |
67 | - require __DIR__ . '/replacing/core/Loader.php'; |
|
67 | + require __DIR__.'/replacing/core/Loader.php'; |
|
68 | 68 | // Load ci-phpunit-test CI_Input |
69 | - require __DIR__ . '/replacing/core/Input.php'; |
|
69 | + require __DIR__.'/replacing/core/Input.php'; |
|
70 | 70 | |
71 | 71 | // Change current directory |
72 | 72 | chdir(FCPATH); |
@@ -78,12 +78,12 @@ discard block |
||
78 | 78 | * |
79 | 79 | * And away we go... |
80 | 80 | */ |
81 | - require __DIR__ . '/replacing/core/CodeIgniter.php'; |
|
81 | + require __DIR__.'/replacing/core/CodeIgniter.php'; |
|
82 | 82 | |
83 | 83 | self::replaceHelpers(); |
84 | 84 | |
85 | 85 | // Create CodeIgniter instance |
86 | - if (! self::wiredesignzHmvcInstalled()) |
|
86 | + if ( ! self::wiredesignzHmvcInstalled()) |
|
87 | 87 | { |
88 | 88 | new CI_Controller(); |
89 | 89 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | |
105 | 105 | public static function createCodeIgniterInstance() |
106 | 106 | { |
107 | - if (! self::wiredesignzHmvcInstalled()) |
|
107 | + if ( ! self::wiredesignzHmvcInstalled()) |
|
108 | 108 | { |
109 | 109 | new CI_Controller(); |
110 | 110 | } |
@@ -133,11 +133,11 @@ discard block |
||
133 | 133 | protected static function replaceLoader() |
134 | 134 | { |
135 | 135 | $my_loader_file = |
136 | - APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php'; |
|
136 | + APPPATH.'core/'.config_item('subclass_prefix').'Loader.php'; |
|
137 | 137 | |
138 | 138 | if (file_exists($my_loader_file)) |
139 | 139 | { |
140 | - self::$loader_class = config_item('subclass_prefix') . 'Loader'; |
|
140 | + self::$loader_class = config_item('subclass_prefix').'Loader'; |
|
141 | 141 | if ( ! class_exists(self::$loader_class)) |
142 | 142 | { |
143 | 143 | require $my_loader_file; |
@@ -156,19 +156,19 @@ discard block |
||
156 | 156 | |
157 | 157 | protected static function loadHelper($helper) |
158 | 158 | { |
159 | - $my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php'; |
|
159 | + $my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php'; |
|
160 | 160 | if (file_exists($my_helper_file)) |
161 | 161 | { |
162 | 162 | require $my_helper_file; |
163 | 163 | } |
164 | - require __DIR__ . '/replacing/helpers/' . $helper . '.php'; |
|
164 | + require __DIR__.'/replacing/helpers/'.$helper.'.php'; |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | public static function setPatcherCacheDir($dir = null) |
168 | 168 | { |
169 | 169 | if ($dir === null) |
170 | 170 | { |
171 | - $dir = TESTPATH . '_ci_phpunit_test/tmp/cache'; |
|
171 | + $dir = TESTPATH.'_ci_phpunit_test/tmp/cache'; |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | MonkeyPatchManager::setCacheDir( |
@@ -293,8 +293,8 @@ discard block |
||
293 | 293 | { |
294 | 294 | empty($config) OR $this->initialize($config, FALSE); |
295 | 295 | |
296 | - $this->_mimes =& get_mimes(); |
|
297 | - $this->_CI =& get_instance(); |
|
296 | + $this->_mimes = & get_mimes(); |
|
297 | + $this->_CI = & get_instance(); |
|
298 | 298 | |
299 | 299 | log_message('info', 'Upload Class Initialized'); |
300 | 300 | } |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | else |
481 | 481 | { |
482 | 482 | // An extension was provided, let's have it! |
483 | - $this->file_ext = $this->get_extension($this->_file_name_override); |
|
483 | + $this->file_ext = $this->get_extension($this->_file_name_override); |
|
484 | 484 | } |
485 | 485 | |
486 | 486 | if ( ! $this->is_allowed_filetype(TRUE)) |
@@ -493,7 +493,7 @@ discard block |
||
493 | 493 | // Convert the file size to kilobytes |
494 | 494 | if ($this->file_size > 0) |
495 | 495 | { |
496 | - $this->file_size = round($this->file_size/1024, 2); |
|
496 | + $this->file_size = round($this->file_size / 1024, 2); |
|
497 | 497 | } |
498 | 498 | |
499 | 499 | // Is the file size within the allowed maximum? |
@@ -818,10 +818,10 @@ discard block |
||
818 | 818 | { |
819 | 819 | $types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png'); |
820 | 820 | |
821 | - $this->image_width = $D[0]; |
|
822 | - $this->image_height = $D[1]; |
|
823 | - $this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown'; |
|
824 | - $this->image_size_str = $D[3]; // string containing height and width |
|
821 | + $this->image_width = $D[0]; |
|
822 | + $this->image_height = $D[1]; |
|
823 | + $this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown'; |
|
824 | + $this->image_size_str = $D[3]; // string containing height and width |
|
825 | 825 | } |
826 | 826 | } |
827 | 827 | |
@@ -869,7 +869,7 @@ discard block |
||
869 | 869 | $this->file_type = 'image/jpeg'; |
870 | 870 | } |
871 | 871 | |
872 | - $img_mimes = array('image/gif', 'image/jpeg', 'image/png'); |
|
872 | + $img_mimes = array('image/gif', 'image/jpeg', 'image/png'); |
|
873 | 873 | |
874 | 874 | return in_array($this->file_type, $img_mimes, TRUE); |
875 | 875 | } |
@@ -1011,7 +1011,7 @@ discard block |
||
1011 | 1011 | return FALSE; |
1012 | 1012 | } |
1013 | 1013 | |
1014 | - $this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path); |
|
1014 | + $this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path); |
|
1015 | 1015 | return TRUE; |
1016 | 1016 | } |
1017 | 1017 | |
@@ -1055,9 +1055,9 @@ discard block |
||
1055 | 1055 | $ext = ''; |
1056 | 1056 | if (strpos($filename, '.') !== FALSE) |
1057 | 1057 | { |
1058 | - $parts = explode('.', $filename); |
|
1059 | - $ext = '.'.array_pop($parts); |
|
1060 | - $filename = implode('.', $parts); |
|
1058 | + $parts = explode('.', $filename); |
|
1059 | + $ext = '.'.array_pop($parts); |
|
1060 | + $filename = implode('.', $parts); |
|
1061 | 1061 | } |
1062 | 1062 | |
1063 | 1063 | return substr($filename, 0, ($length - strlen($ext))).$ext; |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | // Load the mime types |
104 | - $mimes =& get_mimes(); |
|
104 | + $mimes = & get_mimes(); |
|
105 | 105 | |
106 | 106 | // Only change the default MIME if we can find one |
107 | 107 | if (isset($mimes[$extension])) |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | if (ENVIRONMENT === 'testing') |
148 | 148 | { |
149 | - $CI =& get_instance(); |
|
149 | + $CI = & get_instance(); |
|
150 | 150 | $CI->output->set_header('Content-Type: '.$mime); |
151 | 151 | $CI->output->set_header('Content-Disposition: attachment; filename="'.$filename.'"'); |
152 | 152 | $CI->output->set_header('Expires: 0'); |
@@ -105,7 +105,7 @@ |
||
105 | 105 | ob_end_clean(); |
106 | 106 | } |
107 | 107 | |
108 | - throw new CIPHPUnitTestRedirectException('Redirect to ' . $uri, $code); |
|
108 | + throw new CIPHPUnitTestRedirectException('Redirect to '.$uri, $code); |
|
109 | 109 | } |
110 | 110 | } |
111 | 111 | } |
@@ -139,17 +139,17 @@ discard block |
||
139 | 139 | */ |
140 | 140 | public function __construct() |
141 | 141 | { |
142 | - $this->_allow_get_array = (config_item('allow_get_array') !== FALSE); |
|
143 | - $this->_enable_xss = (config_item('global_xss_filtering') === TRUE); |
|
144 | - $this->_enable_csrf = (config_item('csrf_protection') === TRUE); |
|
145 | - $this->_standardize_newlines = (bool) config_item('standardize_newlines'); |
|
142 | + $this->_allow_get_array = (config_item('allow_get_array') !== FALSE); |
|
143 | + $this->_enable_xss = (config_item('global_xss_filtering') === TRUE); |
|
144 | + $this->_enable_csrf = (config_item('csrf_protection') === TRUE); |
|
145 | + $this->_standardize_newlines = (bool) config_item('standardize_newlines'); |
|
146 | 146 | |
147 | - $this->security =& load_class('Security', 'core'); |
|
147 | + $this->security = & load_class('Security', 'core'); |
|
148 | 148 | |
149 | 149 | // Do we need the UTF-8 class? |
150 | 150 | if (UTF8_ENABLED === TRUE) |
151 | 151 | { |
152 | - $this->uni =& load_class('Utf8', 'core'); |
|
152 | + $this->uni = & load_class('Utf8', 'core'); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | // Sanitize global arrays |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | |
430 | 430 | // Save cookie in Output object |
431 | 431 | // added by ci-phpunit-test |
432 | - $CI =& get_instance(); |
|
432 | + $CI = & get_instance(); |
|
433 | 433 | $output = $CI->output; |
434 | 434 | $output->_cookies[$prefix.$name][] = [ |
435 | 435 | 'value' => $value, |
@@ -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, |
@@ -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 | } |