@@ -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 | } |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * |
| 77 | 77 | * @var array |
| 78 | 78 | */ |
| 79 | - public $mimes = array(); |
|
| 79 | + public $mimes = array(); |
|
| 80 | 80 | |
| 81 | 81 | /** |
| 82 | 82 | * Mime-type for the current page |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * |
| 112 | 112 | * @var array |
| 113 | 113 | */ |
| 114 | - protected $_profiler_sections = array(); |
|
| 114 | + protected $_profiler_sections = array(); |
|
| 115 | 115 | |
| 116 | 116 | /** |
| 117 | 117 | * Parse markers flag |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload')); |
| 167 | 167 | |
| 168 | 168 | // Get mime types for later |
| 169 | - $this->mimes =& get_mimes(); |
|
| 169 | + $this->mimes = & get_mimes(); |
|
| 170 | 170 | |
| 171 | 171 | log_message('info', 'Output Class Initialized'); |
| 172 | 172 | } |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | // Is this extension supported? |
| 265 | 265 | if (isset($this->mimes[$extension])) |
| 266 | 266 | { |
| 267 | - $mime_type =& $this->mimes[$extension]; |
|
| 267 | + $mime_type = & $this->mimes[$extension]; |
|
| 268 | 268 | |
| 269 | 269 | if (is_array($mime_type)) |
| 270 | 270 | { |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | { |
| 335 | 335 | if (strncasecmp($header, $headers[$c], $l = self::strlen($header)) === 0) |
| 336 | 336 | { |
| 337 | - return trim(self::substr($headers[$c], $l+1)); |
|
| 337 | + return trim(self::substr($headers[$c], $l + 1)); |
|
| 338 | 338 | } |
| 339 | 339 | } |
| 340 | 340 | |
@@ -437,13 +437,13 @@ discard block |
||
| 437 | 437 | // Note: We use load_class() because we can't use $CI =& get_instance() |
| 438 | 438 | // since this function is sometimes called by the caching mechanism, |
| 439 | 439 | // which happens before the CI super object is available. |
| 440 | - $BM =& load_class('Benchmark', 'core'); |
|
| 441 | - $CFG =& load_class('Config', 'core'); |
|
| 440 | + $BM = & load_class('Benchmark', 'core'); |
|
| 441 | + $CFG = & load_class('Config', 'core'); |
|
| 442 | 442 | |
| 443 | 443 | // Grab the super object if we can. |
| 444 | 444 | if (class_exists('CI_Controller', FALSE)) |
| 445 | 445 | { |
| 446 | - $CI =& get_instance(); |
|
| 446 | + $CI = & get_instance(); |
|
| 447 | 447 | } |
| 448 | 448 | |
| 449 | 449 | // -------------------------------------------------------------------- |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | // Set the output data |
| 452 | 452 | if ($output === '') |
| 453 | 453 | { |
| 454 | - $output =& $this->final_output; |
|
| 454 | + $output = & $this->final_output; |
|
| 455 | 455 | } |
| 456 | 456 | |
| 457 | 457 | // -------------------------------------------------------------------- |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | */ |
| 573 | 573 | public function _write_cache($output) |
| 574 | 574 | { |
| 575 | - $CI =& get_instance(); |
|
| 575 | + $CI = & get_instance(); |
|
| 576 | 576 | $path = $CI->config->item('cache_path'); |
| 577 | 577 | $cache_path = ($path === '') ? APPPATH.'cache/' : $path; |
| 578 | 578 | |
@@ -751,7 +751,7 @@ discard block |
||
| 751 | 751 | */ |
| 752 | 752 | public function delete_cache($uri = '') |
| 753 | 753 | { |
| 754 | - $CI =& get_instance(); |
|
| 754 | + $CI = & get_instance(); |
|
| 755 | 755 | $cache_path = $CI->config->item('cache_path'); |
| 756 | 756 | if ($cache_path === '') |
| 757 | 757 | { |
@@ -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'); |
@@ -819,7 +819,7 @@ discard block |
||
| 819 | 819 | $this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths; |
| 820 | 820 | |
| 821 | 821 | // Add config file path |
| 822 | - $config =& $this->_ci_get_component('config'); |
|
| 822 | + $config = & $this->_ci_get_component('config'); |
|
| 823 | 823 | $config->_config_paths[] = $path; |
| 824 | 824 | |
| 825 | 825 | return $this; |
@@ -858,7 +858,7 @@ discard block |
||
| 858 | 858 | */ |
| 859 | 859 | public function remove_package_path($path = '') |
| 860 | 860 | { |
| 861 | - $config =& $this->_ci_get_component('config'); |
|
| 861 | + $config = & $this->_ci_get_component('config'); |
|
| 862 | 862 | |
| 863 | 863 | if ($path === '') |
| 864 | 864 | { |
@@ -961,12 +961,12 @@ discard block |
||
| 961 | 961 | |
| 962 | 962 | // This allows anything loaded using $this->load (views, files, etc.) |
| 963 | 963 | // to become accessible from within the Controller and Model functions. |
| 964 | - $_ci_CI =& get_instance(); |
|
| 964 | + $_ci_CI = & get_instance(); |
|
| 965 | 965 | foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var) |
| 966 | 966 | { |
| 967 | 967 | if ( ! isset($this->$_ci_key)) |
| 968 | 968 | { |
| 969 | - $this->$_ci_key =& $_ci_CI->$_ci_key; |
|
| 969 | + $this->$_ci_key = & $_ci_CI->$_ci_key; |
|
| 970 | 970 | } |
| 971 | 971 | } |
| 972 | 972 | |
@@ -1099,7 +1099,7 @@ discard block |
||
| 1099 | 1099 | isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property]; |
| 1100 | 1100 | } |
| 1101 | 1101 | |
| 1102 | - $CI =& get_instance(); |
|
| 1102 | + $CI = & get_instance(); |
|
| 1103 | 1103 | if (isset($CI->$property)) |
| 1104 | 1104 | { |
| 1105 | 1105 | // log_message('debug', $class.' class already loaded. Second attempt ignored.'); |
@@ -1174,7 +1174,7 @@ discard block |
||
| 1174 | 1174 | isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property]; |
| 1175 | 1175 | } |
| 1176 | 1176 | |
| 1177 | - $CI =& get_instance(); |
|
| 1177 | + $CI = & get_instance(); |
|
| 1178 | 1178 | if ( ! isset($CI->$property)) |
| 1179 | 1179 | { |
| 1180 | 1180 | return $this->_ci_init_library($library_name, $prefix, $params, $object_name); |
@@ -1322,7 +1322,7 @@ discard block |
||
| 1322 | 1322 | } |
| 1323 | 1323 | |
| 1324 | 1324 | // Don't overwrite existing properties |
| 1325 | - $CI =& get_instance(); |
|
| 1325 | + $CI = & get_instance(); |
|
| 1326 | 1326 | if (isset($CI->$object_name)) |
| 1327 | 1327 | { |
| 1328 | 1328 | if ($CI->$object_name instanceof $class_name) |
@@ -1473,7 +1473,7 @@ discard block |
||
| 1473 | 1473 | */ |
| 1474 | 1474 | protected function &_ci_get_component($component) |
| 1475 | 1475 | { |
| 1476 | - $CI =& get_instance(); |
|
| 1476 | + $CI = & get_instance(); |
|
| 1477 | 1477 | return $CI->$component; |
| 1478 | 1478 | } |
| 1479 | 1479 | } |
@@ -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; |
@@ -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, |
@@ -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; |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | public static function log($message) |
| 43 | 43 | { |
| 44 | - if (! self::$debug) |
|
| 44 | + if ( ! self::$debug) |
|
| 45 | 45 | { |
| 46 | 46 | return; |
| 47 | 47 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | } |
| 81 | 81 | if (is_null(self::$log_file)) |
| 82 | 82 | { |
| 83 | - self::$log_file = __DIR__ . '/debug.log'; |
|
| 83 | + self::$log_file = __DIR__.'/debug.log'; |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | |
@@ -93,10 +93,10 @@ discard block |
||
| 93 | 93 | else |
| 94 | 94 | { |
| 95 | 95 | // APPPATH is constant in CodeIgniter |
| 96 | - Cache::setProjectRootDir(APPPATH . '../'); |
|
| 96 | + Cache::setProjectRootDir(APPPATH.'../'); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - if (! isset($config['cache_dir'])) |
|
| 99 | + if ( ! isset($config['cache_dir'])) |
|
| 100 | 100 | { |
| 101 | 101 | throw new LogicException('You have to set "cache_dir"'); |
| 102 | 102 | } |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | protected static function setPaths(array $config) |
| 107 | 107 | { |
| 108 | - if (! isset($config['include_paths'])) |
|
| 108 | + if ( ! isset($config['include_paths'])) |
|
| 109 | 109 | { |
| 110 | 110 | throw new LogicException('You have to set "include_paths"'); |
| 111 | 111 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | // Updated? |
| 167 | 167 | if ($cached !== $current) |
| 168 | 168 | { |
| 169 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
| 169 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
| 170 | 170 | Cache::clearSrcCache(); |
| 171 | 171 | Cache::writeTmpIncludePaths($current); |
| 172 | 172 | } |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | // Updated? |
| 178 | 178 | if ($cached !== $current) |
| 179 | 179 | { |
| 180 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
| 180 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
| 181 | 181 | Cache::clearSrcCache(); |
| 182 | 182 | Cache::writeTmpExcludePaths($current); |
| 183 | 183 | } |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | // Updated? |
| 191 | 191 | if ($cached !== self::$patcher_list) |
| 192 | 192 | { |
| 193 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
| 193 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
| 194 | 194 | Cache::clearSrcCache(); |
| 195 | 195 | Cache::writeTmpPatcherList(self::$patcher_list); |
| 196 | 196 | } |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | // Updated? |
| 205 | 205 | if ($cached !== $current) |
| 206 | 206 | { |
| 207 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
| 207 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
| 208 | 208 | Cache::clearSrcCache(); |
| 209 | 209 | Cache::writeTmpFunctionWhitelist($current); |
| 210 | 210 | } |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | */ |
| 267 | 267 | public static function patch($path) |
| 268 | 268 | { |
| 269 | - if (! is_readable($path)) |
|
| 269 | + if ( ! is_readable($path)) |
|
| 270 | 270 | { |
| 271 | 271 | throw new LogicException("Can't read '$path'"); |
| 272 | 272 | } |
@@ -274,17 +274,17 @@ discard block |
||
| 274 | 274 | // Check cache file |
| 275 | 275 | if ($cache_file = Cache::getValidSrcCachePath($path)) |
| 276 | 276 | { |
| 277 | - self::log('cache_hit: ' . $path); |
|
| 277 | + self::log('cache_hit: '.$path); |
|
| 278 | 278 | return fopen($cache_file, 'r'); |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | - self::log('cache_miss: ' . $path); |
|
| 281 | + self::log('cache_miss: '.$path); |
|
| 282 | 282 | $source = file_get_contents($path); |
| 283 | 283 | |
| 284 | 284 | list($new_source, $patched) = self::execPatchers($source); |
| 285 | 285 | |
| 286 | 286 | // Write to cache file |
| 287 | - self::log('write_cache: ' . $path); |
|
| 287 | + self::log('write_cache: '.$path); |
|
| 288 | 288 | Cache::writeSrcCacheFile($path, $new_source); |
| 289 | 289 | |
| 290 | 290 | $resource = fopen('php://memory', 'rb+'); |
@@ -300,12 +300,12 @@ discard block |
||
| 300 | 300 | return; |
| 301 | 301 | } |
| 302 | 302 | |
| 303 | - require __DIR__ . '/Patcher/AbstractPatcher.php'; |
|
| 304 | - require __DIR__ . '/Patcher/Backtrace.php'; |
|
| 303 | + require __DIR__.'/Patcher/AbstractPatcher.php'; |
|
| 304 | + require __DIR__.'/Patcher/Backtrace.php'; |
|
| 305 | 305 | |
| 306 | 306 | foreach (self::$patcher_list as $classname) |
| 307 | 307 | { |
| 308 | - require __DIR__ . '/Patcher/' . $classname . '.php'; |
|
| 308 | + require __DIR__.'/Patcher/'.$classname.'.php'; |
|
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | self::$load_patchers = true; |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | $patched = false; |
| 317 | 317 | foreach (self::$patcher_list as $classname) |
| 318 | 318 | { |
| 319 | - $classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname; |
|
| 319 | + $classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname; |
|
| 320 | 320 | $patcher = new $classname; |
| 321 | 321 | list($source, $patched_this) = $patcher->patch($source); |
| 322 | 322 | $patched = $patched || $patched_this; |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | for ($i = 1; $i <= $argc; $i++) { |
| 32 | - if (! isset($argv[$i])) { |
|
| 32 | + if ( ! isset($argv[$i])) { |
|
| 33 | 33 | break; |
| 34 | 34 | } |
| 35 | 35 | |
@@ -41,20 +41,20 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | // php install.php -a application |
| 43 | 43 | case '-a': |
| 44 | - if (is_dir($argv[$i+1])) { |
|
| 45 | - $this->app_dir = $argv[$i+1]; |
|
| 44 | + if (is_dir($argv[$i + 1])) { |
|
| 45 | + $this->app_dir = $argv[$i + 1]; |
|
| 46 | 46 | } else { |
| 47 | - throw new Exception('No such directory: '.$argv[$i+1]); |
|
| 47 | + throw new Exception('No such directory: '.$argv[$i + 1]); |
|
| 48 | 48 | } |
| 49 | 49 | $i++; |
| 50 | 50 | break; |
| 51 | 51 | |
| 52 | 52 | // php install.php -p public |
| 53 | 53 | case '-p': |
| 54 | - if (is_dir($argv[$i+1])) { |
|
| 55 | - $this->pub_dir = $argv[$i+1]; |
|
| 54 | + if (is_dir($argv[$i + 1])) { |
|
| 55 | + $this->pub_dir = $argv[$i + 1]; |
|
| 56 | 56 | } else { |
| 57 | - throw new Exception('No such directory: '.$argv[$i+1]); |
|
| 57 | + throw new Exception('No such directory: '.$argv[$i + 1]); |
|
| 58 | 58 | } |
| 59 | 59 | $i++; |
| 60 | 60 | break; |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $file = $this->app_dir.'/'.$this->test_dir.'/Bootstrap.php'; |
| 83 | 83 | $contents = file_get_contents($file); |
| 84 | 84 | |
| 85 | - if (! file_exists('system')) { |
|
| 85 | + if ( ! file_exists('system')) { |
|
| 86 | 86 | if (file_exists('vendor/codeigniter/framework/system')) { |
| 87 | 87 | $contents = str_replace( |
| 88 | 88 | '$system_path = \'../../system\';', |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | } |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - if (! file_exists('index.php')) { |
|
| 97 | + if ( ! file_exists('index.php')) { |
|
| 98 | 98 | if (file_exists($this->pub_dir.'/index.php')) { |
| 99 | 99 | // CodeIgniter 3.0.6 and after |
| 100 | 100 | $contents = str_replace( |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | } else { |
| 168 | 168 | $success = copy($file, $dst.'/'.$iterator->getSubPathName()); |
| 169 | 169 | if ($success) { |
| 170 | - if (! $this->silent) { |
|
| 170 | + if ( ! $this->silent) { |
|
| 171 | 171 | echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL; |
| 172 | 172 | } |
| 173 | 173 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $method = isset($info['class_method']) ? $info['class_method'] : $info['function']; |
| 64 | 64 | |
| 65 | 65 | MonkeyPatchManager::log( |
| 66 | - 'invoke_const: ' . $constant . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()' |
|
| 66 | + 'invoke_const: '.$constant.') on line '.$line.' in '.$file.' by '.$method.'()' |
|
| 67 | 67 | ); |
| 68 | 68 | } |
| 69 | 69 | } |
@@ -106,12 +106,12 @@ discard block |
||
| 106 | 106 | { |
| 107 | 107 | self::logInvocation($constant); |
| 108 | 108 | |
| 109 | - if (! empty(self::$patches_to_apply[$constant])) |
|
| 109 | + if ( ! empty(self::$patches_to_apply[$constant])) |
|
| 110 | 110 | { |
| 111 | - if (! self::checkCalledMethod($constant)) |
|
| 111 | + if ( ! self::checkCalledMethod($constant)) |
|
| 112 | 112 | { |
| 113 | 113 | MonkeyPatchManager::log( |
| 114 | - 'invoke_const: ' . $constant . ' not patched (out of scope)' |
|
| 114 | + 'invoke_const: '.$constant.' not patched (out of scope)' |
|
| 115 | 115 | ); |
| 116 | 116 | return constant($constant); |
| 117 | 117 | } |
@@ -119,12 +119,12 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | if (array_key_exists($constant, self::$patches)) |
| 121 | 121 | { |
| 122 | - MonkeyPatchManager::log('invoke_const: ' . $constant . ' patched'); |
|
| 122 | + MonkeyPatchManager::log('invoke_const: '.$constant.' patched'); |
|
| 123 | 123 | return self::$patches[$constant]; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | MonkeyPatchManager::log( |
| 127 | - 'invoke_const: ' . $constant . ' not patched (no patch)' |
|
| 127 | + 'invoke_const: '.$constant.' not patched (no patch)' |
|
| 128 | 128 | ); |
| 129 | 129 | return constant($constant); |
| 130 | 130 | } |