@@ -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 | } |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | if ($_log === NULL) |
202 | 202 | { |
203 | 203 | // references cannot be directly assigned to static variables, so we use an array |
204 | - $_log[0] =& load_class('Log', 'core'); |
|
204 | + $_log[0] = & load_class('Log', 'core'); |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | $_log[0]->write_log($level, $message); |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | |
292 | 292 | // Save status code in Output object |
293 | 293 | // added by ci-phpunit-test |
294 | - $CI =& get_instance(); |
|
294 | + $CI = & get_instance(); |
|
295 | 295 | $output = $CI->output; |
296 | 296 | $output->_status = [ |
297 | 297 | 'code' => $code, |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | if (empty($_config)) |
406 | 406 | { |
407 | 407 | // references cannot be directly assigned to static variables, so we use an array |
408 | - $_config[0] =& get_config(); |
|
408 | + $_config[0] = & get_config(); |
|
409 | 409 | } |
410 | 410 | |
411 | 411 | return isset($_config[0][$item]) ? $_config[0][$item] : NULL; |
@@ -296,8 +296,8 @@ discard block |
||
296 | 296 | { |
297 | 297 | empty($config) OR $this->initialize($config, FALSE); |
298 | 298 | |
299 | - $this->_mimes =& get_mimes(); |
|
300 | - $this->_CI =& get_instance(); |
|
299 | + $this->_mimes = & get_mimes(); |
|
300 | + $this->_CI = & get_instance(); |
|
301 | 301 | |
302 | 302 | log_message('info', 'Upload Class Initialized'); |
303 | 303 | } |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | else |
488 | 488 | { |
489 | 489 | // An extension was provided, let's have it! |
490 | - $this->file_ext = $this->get_extension($this->_file_name_override); |
|
490 | + $this->file_ext = $this->get_extension($this->_file_name_override); |
|
491 | 491 | } |
492 | 492 | |
493 | 493 | if ( ! $this->is_allowed_filetype(TRUE)) |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | // Convert the file size to kilobytes |
501 | 501 | if ($this->file_size > 0) |
502 | 502 | { |
503 | - $this->file_size = round($this->file_size/1024, 2); |
|
503 | + $this->file_size = round($this->file_size / 1024, 2); |
|
504 | 504 | } |
505 | 505 | |
506 | 506 | // Is the file size within the allowed maximum? |
@@ -833,10 +833,10 @@ discard block |
||
833 | 833 | { |
834 | 834 | $types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png'); |
835 | 835 | |
836 | - $this->image_width = $D[0]; |
|
837 | - $this->image_height = $D[1]; |
|
838 | - $this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown'; |
|
839 | - $this->image_size_str = $D[3]; // string containing height and width |
|
836 | + $this->image_width = $D[0]; |
|
837 | + $this->image_height = $D[1]; |
|
838 | + $this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown'; |
|
839 | + $this->image_size_str = $D[3]; // string containing height and width |
|
840 | 840 | } |
841 | 841 | } |
842 | 842 | |
@@ -888,7 +888,7 @@ discard block |
||
888 | 888 | $this->file_type = 'image/jpeg'; |
889 | 889 | } |
890 | 890 | |
891 | - $img_mimes = array('image/gif', 'image/jpeg', 'image/png', 'image/webp'); |
|
891 | + $img_mimes = array('image/gif', 'image/jpeg', 'image/png', 'image/webp'); |
|
892 | 892 | |
893 | 893 | return in_array($this->file_type, $img_mimes, TRUE); |
894 | 894 | } |
@@ -1038,7 +1038,7 @@ discard block |
||
1038 | 1038 | return FALSE; |
1039 | 1039 | } |
1040 | 1040 | |
1041 | - $this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path); |
|
1041 | + $this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path); |
|
1042 | 1042 | return TRUE; |
1043 | 1043 | } |
1044 | 1044 | |
@@ -1086,9 +1086,9 @@ discard block |
||
1086 | 1086 | $ext = ''; |
1087 | 1087 | if (strpos($filename, '.') !== FALSE) |
1088 | 1088 | { |
1089 | - $parts = explode('.', $filename); |
|
1090 | - $ext = '.'.array_pop($parts); |
|
1091 | - $filename = implode('.', $parts); |
|
1089 | + $parts = explode('.', $filename); |
|
1090 | + $ext = '.'.array_pop($parts); |
|
1091 | + $filename = implode('.', $parts); |
|
1092 | 1092 | } |
1093 | 1093 | |
1094 | 1094 | return substr($filename, 0, ($length - strlen($ext))).$ext; |
@@ -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; |
@@ -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 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | // Load the mime types |
75 | - $mimes =& get_mimes(); |
|
75 | + $mimes = & get_mimes(); |
|
76 | 76 | |
77 | 77 | // Only change the default MIME if we can find one |
78 | 78 | if (isset($mimes[$extension])) |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | |
118 | 118 | if (TestCase::isTestingEnv()) |
119 | 119 | { |
120 | - $CI =& get_instance(); |
|
120 | + $CI = & get_instance(); |
|
121 | 121 | $CI->output->set_header('Content-Type: '.$mime); |
122 | 122 | $CI->output->set_header('Content-Disposition: attachment; filename="'.$filename.'"'); |
123 | 123 | $CI->output->set_header('Expires: 0'); |