@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | public static function getInfo($patcher, $backtrace) |
| 23 | 23 | { |
| 24 | - if (! isset(self::$map[$patcher])) |
|
| 24 | + if ( ! isset(self::$map[$patcher])) |
|
| 25 | 25 | { |
| 26 | 26 | throw new LogicException("No such a patcher: $patcher"); |
| 27 | 27 | } |
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | $line = isset($backtrace[$offset]['line']) |
| 42 | 42 | ? $backtrace[$offset]['line'] : null; |
| 43 | 43 | |
| 44 | - if (isset($backtrace[$offset+2])) |
|
| 44 | + if (isset($backtrace[$offset + 2])) |
|
| 45 | 45 | { |
| 46 | - $class = isset($backtrace[$offset+2]['class']) |
|
| 47 | - ? $backtrace[$offset+2]['class'] |
|
| 46 | + $class = isset($backtrace[$offset + 2]['class']) |
|
| 47 | + ? $backtrace[$offset + 2]['class'] |
|
| 48 | 48 | : null; |
| 49 | - $function = $backtrace[$offset+2]['function']; |
|
| 49 | + $function = $backtrace[$offset + 2]['function']; |
|
| 50 | 50 | } |
| 51 | 51 | else |
| 52 | 52 | { |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | if (isset($class)) |
| 58 | 58 | { |
| 59 | 59 | $method = $function; |
| 60 | - $class_method = $class . '::' . $function; |
|
| 60 | + $class_method = $class.'::'.$function; |
|
| 61 | 61 | $function = null; |
| 62 | 62 | } |
| 63 | 63 | else |
@@ -10,8 +10,8 @@ |
||
| 10 | 10 | |
| 11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
| 12 | 12 | |
| 13 | -require __DIR__ . '/FunctionPatcher/NodeVisitor.php'; |
|
| 14 | -require __DIR__ . '/FunctionPatcher/Proxy.php'; |
|
| 13 | +require __DIR__.'/FunctionPatcher/NodeVisitor.php'; |
|
| 14 | +require __DIR__.'/FunctionPatcher/Proxy.php'; |
|
| 15 | 15 | |
| 16 | 16 | use LogicException; |
| 17 | 17 | |
@@ -10,8 +10,8 @@ |
||
| 10 | 10 | |
| 11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
| 12 | 12 | |
| 13 | -require __DIR__ . '/ConstantPatcher/NodeVisitor.php'; |
|
| 14 | -require __DIR__ . '/ConstantPatcher/Proxy.php'; |
|
| 13 | +require __DIR__.'/ConstantPatcher/NodeVisitor.php'; |
|
| 14 | +require __DIR__.'/ConstantPatcher/Proxy.php'; |
|
| 15 | 15 | |
| 16 | 16 | use LogicException; |
| 17 | 17 | |
@@ -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; |
@@ -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 | ); |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | public function __construct() |
| 137 | 137 | { |
| 138 | 138 | $this->_ci_ob_level = ob_get_level(); |
| 139 | - $this->_ci_classes =& is_loaded(); |
|
| 139 | + $this->_ci_classes = & is_loaded(); |
|
| 140 | 140 | |
| 141 | 141 | log_message('info', 'Loader Class Initialized'); |
| 142 | 142 | } |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | return $this; |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - $CI =& get_instance(); |
|
| 274 | + $CI = & get_instance(); |
|
| 275 | 275 | if (isset($CI->$name)) |
| 276 | 276 | { |
| 277 | 277 | throw new RuntimeException('The model name you are loading is the name of a resource that is already being used: '.$name); |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | public function database($params = '', $return = FALSE, $query_builder = NULL) |
| 343 | 343 | { |
| 344 | 344 | // Grab the super object |
| 345 | - $CI =& get_instance(); |
|
| 345 | + $CI = & get_instance(); |
|
| 346 | 346 | |
| 347 | 347 | // Do we even need to load the database class? |
| 348 | 348 | if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id)) |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | $CI->db = ''; |
| 363 | 363 | |
| 364 | 364 | // Load the DB class |
| 365 | - $CI->db =& DB($params, $query_builder); |
|
| 365 | + $CI->db = & DB($params, $query_builder); |
|
| 366 | 366 | return $this; |
| 367 | 367 | } |
| 368 | 368 | |
@@ -377,12 +377,12 @@ discard block |
||
| 377 | 377 | */ |
| 378 | 378 | public function dbutil($db = NULL, $return = FALSE) |
| 379 | 379 | { |
| 380 | - $CI =& get_instance(); |
|
| 380 | + $CI = & get_instance(); |
|
| 381 | 381 | |
| 382 | 382 | if ( ! is_object($db) OR ! ($db instanceof CI_DB)) |
| 383 | 383 | { |
| 384 | 384 | class_exists('CI_DB', FALSE) OR $this->database(); |
| 385 | - $db =& $CI->db; |
|
| 385 | + $db = & $CI->db; |
|
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | require_once(BASEPATH.'database/DB_utility.php'); |
@@ -409,11 +409,11 @@ discard block |
||
| 409 | 409 | */ |
| 410 | 410 | public function dbforge($db = NULL, $return = FALSE) |
| 411 | 411 | { |
| 412 | - $CI =& get_instance(); |
|
| 412 | + $CI = & get_instance(); |
|
| 413 | 413 | if ( ! is_object($db) OR ! ($db instanceof CI_DB)) |
| 414 | 414 | { |
| 415 | 415 | class_exists('CI_DB', FALSE) OR $this->database(); |
| 416 | - $db =& $CI->db; |
|
| 416 | + $db = & $CI->db; |
|
| 417 | 417 | } |
| 418 | 418 | |
| 419 | 419 | require_once(BASEPATH.'database/DB_forge.php'); |
@@ -746,7 +746,7 @@ discard block |
||
| 746 | 746 | $this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths; |
| 747 | 747 | |
| 748 | 748 | // Add config file path |
| 749 | - $config =& $this->_ci_get_component('config'); |
|
| 749 | + $config = & $this->_ci_get_component('config'); |
|
| 750 | 750 | $config->_config_paths[] = $path; |
| 751 | 751 | |
| 752 | 752 | return $this; |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | */ |
| 782 | 782 | public function remove_package_path($path = '') |
| 783 | 783 | { |
| 784 | - $config =& $this->_ci_get_component('config'); |
|
| 784 | + $config = & $this->_ci_get_component('config'); |
|
| 785 | 785 | |
| 786 | 786 | if ($path === '') |
| 787 | 787 | { |
@@ -882,12 +882,12 @@ discard block |
||
| 882 | 882 | |
| 883 | 883 | // This allows anything loaded using $this->load (views, files, etc.) |
| 884 | 884 | // to become accessible from within the Controller and Model functions. |
| 885 | - $_ci_CI =& get_instance(); |
|
| 885 | + $_ci_CI = & get_instance(); |
|
| 886 | 886 | foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var) |
| 887 | 887 | { |
| 888 | 888 | if ( ! isset($this->$_ci_key)) |
| 889 | 889 | { |
| 890 | - $this->$_ci_key =& $_ci_CI->$_ci_key; |
|
| 890 | + $this->$_ci_key = & $_ci_CI->$_ci_key; |
|
| 891 | 891 | } |
| 892 | 892 | } |
| 893 | 893 | |
@@ -1026,7 +1026,7 @@ discard block |
||
| 1026 | 1026 | // return a new instance of the object |
| 1027 | 1027 | if ($object_name !== NULL) |
| 1028 | 1028 | { |
| 1029 | - $CI =& get_instance(); |
|
| 1029 | + $CI = & get_instance(); |
|
| 1030 | 1030 | if ( ! isset($CI->$object_name)) |
| 1031 | 1031 | { |
| 1032 | 1032 | return $this->_ci_init_library($class, '', $params, $object_name); |
@@ -1089,7 +1089,7 @@ discard block |
||
| 1089 | 1089 | // return a new instance of the object |
| 1090 | 1090 | if ($object_name !== NULL) |
| 1091 | 1091 | { |
| 1092 | - $CI =& get_instance(); |
|
| 1092 | + $CI = & get_instance(); |
|
| 1093 | 1093 | if ( ! isset($CI->$object_name)) |
| 1094 | 1094 | { |
| 1095 | 1095 | return $this->_ci_init_library($library_name, $prefix, $params, $object_name); |
@@ -1232,7 +1232,7 @@ discard block |
||
| 1232 | 1232 | } |
| 1233 | 1233 | |
| 1234 | 1234 | // Don't overwrite existing properties |
| 1235 | - $CI =& get_instance(); |
|
| 1235 | + $CI = & get_instance(); |
|
| 1236 | 1236 | if (isset($CI->$object_name)) |
| 1237 | 1237 | { |
| 1238 | 1238 | if ($CI->$object_name instanceof $class_name) |
@@ -1365,7 +1365,7 @@ discard block |
||
| 1365 | 1365 | */ |
| 1366 | 1366 | protected function &_ci_get_component($component) |
| 1367 | 1367 | { |
| 1368 | - $CI =& get_instance(); |
|
| 1368 | + $CI = & get_instance(); |
|
| 1369 | 1369 | return $CI->$component; |
| 1370 | 1370 | } |
| 1371 | 1371 | |
@@ -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 | ); |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | public function __construct() |
| 137 | 137 | { |
| 138 | 138 | $this->_ci_ob_level = ob_get_level(); |
| 139 | - $this->_ci_classes =& is_loaded(); |
|
| 139 | + $this->_ci_classes = & is_loaded(); |
|
| 140 | 140 | |
| 141 | 141 | log_message('info', 'Loader Class Initialized'); |
| 142 | 142 | } |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | return $this; |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - $CI =& get_instance(); |
|
| 274 | + $CI = & get_instance(); |
|
| 275 | 275 | if (isset($CI->$name)) |
| 276 | 276 | { |
| 277 | 277 | show_error('The model name you are loading is the name of a resource that is already being used: '.$name); |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | public function database($params = '', $return = FALSE, $query_builder = NULL) |
| 329 | 329 | { |
| 330 | 330 | // Grab the super object |
| 331 | - $CI =& get_instance(); |
|
| 331 | + $CI = & get_instance(); |
|
| 332 | 332 | |
| 333 | 333 | // Do we even need to load the database class? |
| 334 | 334 | if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id)) |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | $CI->db = ''; |
| 349 | 349 | |
| 350 | 350 | // Load the DB class |
| 351 | - $CI->db =& DB($params, $query_builder); |
|
| 351 | + $CI->db = & DB($params, $query_builder); |
|
| 352 | 352 | return $this; |
| 353 | 353 | } |
| 354 | 354 | |
@@ -363,12 +363,12 @@ discard block |
||
| 363 | 363 | */ |
| 364 | 364 | public function dbutil($db = NULL, $return = FALSE) |
| 365 | 365 | { |
| 366 | - $CI =& get_instance(); |
|
| 366 | + $CI = & get_instance(); |
|
| 367 | 367 | |
| 368 | 368 | if ( ! is_object($db) OR ! ($db instanceof CI_DB)) |
| 369 | 369 | { |
| 370 | 370 | class_exists('CI_DB', FALSE) OR $this->database(); |
| 371 | - $db =& $CI->db; |
|
| 371 | + $db = & $CI->db; |
|
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | require_once(BASEPATH.'database/DB_utility.php'); |
@@ -395,11 +395,11 @@ discard block |
||
| 395 | 395 | */ |
| 396 | 396 | public function dbforge($db = NULL, $return = FALSE) |
| 397 | 397 | { |
| 398 | - $CI =& get_instance(); |
|
| 398 | + $CI = & get_instance(); |
|
| 399 | 399 | if ( ! is_object($db) OR ! ($db instanceof CI_DB)) |
| 400 | 400 | { |
| 401 | 401 | class_exists('CI_DB', FALSE) OR $this->database(); |
| 402 | - $db =& $CI->db; |
|
| 402 | + $db = & $CI->db; |
|
| 403 | 403 | } |
| 404 | 404 | |
| 405 | 405 | require_once(BASEPATH.'database/DB_forge.php'); |
@@ -732,7 +732,7 @@ discard block |
||
| 732 | 732 | $this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths; |
| 733 | 733 | |
| 734 | 734 | // Add config file path |
| 735 | - $config =& $this->_ci_get_component('config'); |
|
| 735 | + $config = & $this->_ci_get_component('config'); |
|
| 736 | 736 | $config->_config_paths[] = $path; |
| 737 | 737 | |
| 738 | 738 | return $this; |
@@ -767,7 +767,7 @@ discard block |
||
| 767 | 767 | */ |
| 768 | 768 | public function remove_package_path($path = '') |
| 769 | 769 | { |
| 770 | - $config =& $this->_ci_get_component('config'); |
|
| 770 | + $config = & $this->_ci_get_component('config'); |
|
| 771 | 771 | |
| 772 | 772 | if ($path === '') |
| 773 | 773 | { |
@@ -868,12 +868,12 @@ discard block |
||
| 868 | 868 | |
| 869 | 869 | // This allows anything loaded using $this->load (views, files, etc.) |
| 870 | 870 | // to become accessible from within the Controller and Model functions. |
| 871 | - $_ci_CI =& get_instance(); |
|
| 871 | + $_ci_CI = & get_instance(); |
|
| 872 | 872 | foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var) |
| 873 | 873 | { |
| 874 | 874 | if ( ! isset($this->$_ci_key)) |
| 875 | 875 | { |
| 876 | - $this->$_ci_key =& $_ci_CI->$_ci_key; |
|
| 876 | + $this->$_ci_key = & $_ci_CI->$_ci_key; |
|
| 877 | 877 | } |
| 878 | 878 | } |
| 879 | 879 | |
@@ -1012,7 +1012,7 @@ discard block |
||
| 1012 | 1012 | // return a new instance of the object |
| 1013 | 1013 | if ($object_name !== NULL) |
| 1014 | 1014 | { |
| 1015 | - $CI =& get_instance(); |
|
| 1015 | + $CI = & get_instance(); |
|
| 1016 | 1016 | if ( ! isset($CI->$object_name)) |
| 1017 | 1017 | { |
| 1018 | 1018 | return $this->_ci_init_library($class, '', $params, $object_name); |
@@ -1075,7 +1075,7 @@ discard block |
||
| 1075 | 1075 | // return a new instance of the object |
| 1076 | 1076 | if ($object_name !== NULL) |
| 1077 | 1077 | { |
| 1078 | - $CI =& get_instance(); |
|
| 1078 | + $CI = & get_instance(); |
|
| 1079 | 1079 | if ( ! isset($CI->$object_name)) |
| 1080 | 1080 | { |
| 1081 | 1081 | return $this->_ci_init_library($library_name, $prefix, $params, $object_name); |
@@ -1218,7 +1218,7 @@ discard block |
||
| 1218 | 1218 | } |
| 1219 | 1219 | |
| 1220 | 1220 | // Don't overwrite existing properties |
| 1221 | - $CI =& get_instance(); |
|
| 1221 | + $CI = & get_instance(); |
|
| 1222 | 1222 | if (isset($CI->$object_name)) |
| 1223 | 1223 | { |
| 1224 | 1224 | if ($CI->$object_name instanceof $class_name) |
@@ -1354,7 +1354,7 @@ discard block |
||
| 1354 | 1354 | */ |
| 1355 | 1355 | protected function &_ci_get_component($component) |
| 1356 | 1356 | { |
| 1357 | - $CI =& get_instance(); |
|
| 1357 | + $CI = & get_instance(); |
|
| 1358 | 1358 | return $CI->$component; |
| 1359 | 1359 | } |
| 1360 | 1360 | |
@@ -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 | ); |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | public function __construct() |
| 137 | 137 | { |
| 138 | 138 | $this->_ci_ob_level = ob_get_level(); |
| 139 | - $this->_ci_classes =& is_loaded(); |
|
| 139 | + $this->_ci_classes = & is_loaded(); |
|
| 140 | 140 | |
| 141 | 141 | log_message('info', 'Loader Class Initialized'); |
| 142 | 142 | } |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | return $this; |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - $CI =& get_instance(); |
|
| 274 | + $CI = & get_instance(); |
|
| 275 | 275 | if (isset($CI->$name)) |
| 276 | 276 | { |
| 277 | 277 | throw new RuntimeException('The model name you are loading is the name of a resource that is already being used: '.$name); |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | public function database($params = '', $return = FALSE, $query_builder = NULL) |
| 343 | 343 | { |
| 344 | 344 | // Grab the super object |
| 345 | - $CI =& get_instance(); |
|
| 345 | + $CI = & get_instance(); |
|
| 346 | 346 | |
| 347 | 347 | // Do we even need to load the database class? |
| 348 | 348 | if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id)) |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | $CI->db = ''; |
| 363 | 363 | |
| 364 | 364 | // Load the DB class |
| 365 | - $CI->db =& DB($params, $query_builder); |
|
| 365 | + $CI->db = & DB($params, $query_builder); |
|
| 366 | 366 | return $this; |
| 367 | 367 | } |
| 368 | 368 | |
@@ -377,12 +377,12 @@ discard block |
||
| 377 | 377 | */ |
| 378 | 378 | public function dbutil($db = NULL, $return = FALSE) |
| 379 | 379 | { |
| 380 | - $CI =& get_instance(); |
|
| 380 | + $CI = & get_instance(); |
|
| 381 | 381 | |
| 382 | 382 | if ( ! is_object($db) OR ! ($db instanceof CI_DB)) |
| 383 | 383 | { |
| 384 | 384 | class_exists('CI_DB', FALSE) OR $this->database(); |
| 385 | - $db =& $CI->db; |
|
| 385 | + $db = & $CI->db; |
|
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | require_once(BASEPATH.'database/DB_utility.php'); |
@@ -409,11 +409,11 @@ discard block |
||
| 409 | 409 | */ |
| 410 | 410 | public function dbforge($db = NULL, $return = FALSE) |
| 411 | 411 | { |
| 412 | - $CI =& get_instance(); |
|
| 412 | + $CI = & get_instance(); |
|
| 413 | 413 | if ( ! is_object($db) OR ! ($db instanceof CI_DB)) |
| 414 | 414 | { |
| 415 | 415 | class_exists('CI_DB', FALSE) OR $this->database(); |
| 416 | - $db =& $CI->db; |
|
| 416 | + $db = & $CI->db; |
|
| 417 | 417 | } |
| 418 | 418 | |
| 419 | 419 | require_once(BASEPATH.'database/DB_forge.php'); |
@@ -746,7 +746,7 @@ discard block |
||
| 746 | 746 | $this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths; |
| 747 | 747 | |
| 748 | 748 | // Add config file path |
| 749 | - $config =& $this->_ci_get_component('config'); |
|
| 749 | + $config = & $this->_ci_get_component('config'); |
|
| 750 | 750 | $config->_config_paths[] = $path; |
| 751 | 751 | |
| 752 | 752 | return $this; |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | */ |
| 782 | 782 | public function remove_package_path($path = '') |
| 783 | 783 | { |
| 784 | - $config =& $this->_ci_get_component('config'); |
|
| 784 | + $config = & $this->_ci_get_component('config'); |
|
| 785 | 785 | |
| 786 | 786 | if ($path === '') |
| 787 | 787 | { |
@@ -882,12 +882,12 @@ discard block |
||
| 882 | 882 | |
| 883 | 883 | // This allows anything loaded using $this->load (views, files, etc.) |
| 884 | 884 | // to become accessible from within the Controller and Model functions. |
| 885 | - $_ci_CI =& get_instance(); |
|
| 885 | + $_ci_CI = & get_instance(); |
|
| 886 | 886 | foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var) |
| 887 | 887 | { |
| 888 | 888 | if ( ! isset($this->$_ci_key)) |
| 889 | 889 | { |
| 890 | - $this->$_ci_key =& $_ci_CI->$_ci_key; |
|
| 890 | + $this->$_ci_key = & $_ci_CI->$_ci_key; |
|
| 891 | 891 | } |
| 892 | 892 | } |
| 893 | 893 | |
@@ -1026,7 +1026,7 @@ discard block |
||
| 1026 | 1026 | // return a new instance of the object |
| 1027 | 1027 | if ($object_name !== NULL) |
| 1028 | 1028 | { |
| 1029 | - $CI =& get_instance(); |
|
| 1029 | + $CI = & get_instance(); |
|
| 1030 | 1030 | if ( ! isset($CI->$object_name)) |
| 1031 | 1031 | { |
| 1032 | 1032 | return $this->_ci_init_library($class, '', $params, $object_name); |
@@ -1089,7 +1089,7 @@ discard block |
||
| 1089 | 1089 | // return a new instance of the object |
| 1090 | 1090 | if ($object_name !== NULL) |
| 1091 | 1091 | { |
| 1092 | - $CI =& get_instance(); |
|
| 1092 | + $CI = & get_instance(); |
|
| 1093 | 1093 | if ( ! isset($CI->$object_name)) |
| 1094 | 1094 | { |
| 1095 | 1095 | return $this->_ci_init_library($library_name, $prefix, $params, $object_name); |
@@ -1232,7 +1232,7 @@ discard block |
||
| 1232 | 1232 | } |
| 1233 | 1233 | |
| 1234 | 1234 | // Don't overwrite existing properties |
| 1235 | - $CI =& get_instance(); |
|
| 1235 | + $CI = & get_instance(); |
|
| 1236 | 1236 | if (isset($CI->$object_name)) |
| 1237 | 1237 | { |
| 1238 | 1238 | if ($CI->$object_name instanceof $class_name) |
@@ -1365,7 +1365,7 @@ discard block |
||
| 1365 | 1365 | */ |
| 1366 | 1366 | protected function &_ci_get_component($component) |
| 1367 | 1367 | { |
| 1368 | - $CI =& get_instance(); |
|
| 1368 | + $CI = & get_instance(); |
|
| 1369 | 1369 | return $CI->$component; |
| 1370 | 1370 | } |
| 1371 | 1371 | |
@@ -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, |