@@ -63,63 +63,63 @@ discard block |
||
| 63 | 63 | * |
| 64 | 64 | * @var array |
| 65 | 65 | */ |
| 66 | - protected $_ci_view_paths = array(VIEWPATH => TRUE); |
|
| 66 | + protected $_ci_view_paths = array(VIEWPATH => TRUE); |
|
| 67 | 67 | |
| 68 | 68 | /** |
| 69 | 69 | * List of paths to load libraries from |
| 70 | 70 | * |
| 71 | 71 | * @var array |
| 72 | 72 | */ |
| 73 | - protected $_ci_library_paths = array(APPPATH, BASEPATH); |
|
| 73 | + protected $_ci_library_paths = array(APPPATH, BASEPATH); |
|
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | 76 | * List of paths to load models from |
| 77 | 77 | * |
| 78 | 78 | * @var array |
| 79 | 79 | */ |
| 80 | - protected $_ci_model_paths = array(APPPATH); |
|
| 80 | + protected $_ci_model_paths = array(APPPATH); |
|
| 81 | 81 | |
| 82 | 82 | /** |
| 83 | 83 | * List of paths to load helpers from |
| 84 | 84 | * |
| 85 | 85 | * @var array |
| 86 | 86 | */ |
| 87 | - protected $_ci_helper_paths = array(APPPATH, BASEPATH); |
|
| 87 | + protected $_ci_helper_paths = array(APPPATH, BASEPATH); |
|
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | 90 | * List of cached variables |
| 91 | 91 | * |
| 92 | 92 | * @var array |
| 93 | 93 | */ |
| 94 | - protected $_ci_cached_vars = array(); |
|
| 94 | + protected $_ci_cached_vars = array(); |
|
| 95 | 95 | |
| 96 | 96 | /** |
| 97 | 97 | * List of loaded classes |
| 98 | 98 | * |
| 99 | 99 | * @var array |
| 100 | 100 | */ |
| 101 | - protected $_ci_classes = array(); |
|
| 101 | + protected $_ci_classes = array(); |
|
| 102 | 102 | |
| 103 | 103 | /** |
| 104 | 104 | * List of loaded models |
| 105 | 105 | * |
| 106 | 106 | * @var array |
| 107 | 107 | */ |
| 108 | - protected $_ci_models = array(); |
|
| 108 | + protected $_ci_models = array(); |
|
| 109 | 109 | |
| 110 | 110 | /** |
| 111 | 111 | * List of loaded helpers |
| 112 | 112 | * |
| 113 | 113 | * @var array |
| 114 | 114 | */ |
| 115 | - protected $_ci_helpers = array(); |
|
| 115 | + protected $_ci_helpers = array(); |
|
| 116 | 116 | |
| 117 | 117 | /** |
| 118 | 118 | * List of class name mappings |
| 119 | 119 | * |
| 120 | 120 | * @var array |
| 121 | 121 | */ |
| 122 | - protected $_ci_varmap = array( |
|
| 122 | + protected $_ci_varmap = array( |
|
| 123 | 123 | 'unit_test' => 'unit', |
| 124 | 124 | 'user_agent' => 'agent' |
| 125 | 125 | ); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | public function __construct() |
| 139 | 139 | { |
| 140 | 140 | $this->_ci_ob_level = ob_get_level(); |
| 141 | - $this->_ci_classes =& is_loaded(); |
|
| 141 | + $this->_ci_classes = & is_loaded(); |
|
| 142 | 142 | |
| 143 | 143 | log_message('info', 'Loader Class Initialized'); |
| 144 | 144 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | return $this; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | - $CI =& get_instance(); |
|
| 282 | + $CI = & get_instance(); |
|
| 283 | 283 | if (isset($CI->$name)) |
| 284 | 284 | { |
| 285 | 285 | throw new RuntimeException('The model name you are loading is the name of a resource that is already being used: '.$name); |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | public function database($params = '', $return = FALSE, $query_builder = NULL) |
| 383 | 383 | { |
| 384 | 384 | // Grab the super object |
| 385 | - $CI =& get_instance(); |
|
| 385 | + $CI = & get_instance(); |
|
| 386 | 386 | |
| 387 | 387 | // Do we even need to load the database class? |
| 388 | 388 | if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id)) |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | $CI->db = ''; |
| 403 | 403 | |
| 404 | 404 | // Load the DB class |
| 405 | - $CI->db =& DB($params, $query_builder); |
|
| 405 | + $CI->db = & DB($params, $query_builder); |
|
| 406 | 406 | return $this; |
| 407 | 407 | } |
| 408 | 408 | |
@@ -419,12 +419,12 @@ discard block |
||
| 419 | 419 | */ |
| 420 | 420 | public function dbutil($db = NULL, $return = FALSE) |
| 421 | 421 | { |
| 422 | - $CI =& get_instance(); |
|
| 422 | + $CI = & get_instance(); |
|
| 423 | 423 | |
| 424 | 424 | if ( ! is_object($db) OR ! ($db instanceof CI_DB)) |
| 425 | 425 | { |
| 426 | 426 | class_exists('CI_DB', FALSE) OR $this->database(); |
| 427 | - $db =& $CI->db; |
|
| 427 | + $db = & $CI->db; |
|
| 428 | 428 | } |
| 429 | 429 | |
| 430 | 430 | require_once(BASEPATH.'database/DB_utility.php'); |
@@ -453,11 +453,11 @@ discard block |
||
| 453 | 453 | */ |
| 454 | 454 | public function dbforge($db = NULL, $return = FALSE) |
| 455 | 455 | { |
| 456 | - $CI =& get_instance(); |
|
| 456 | + $CI = & get_instance(); |
|
| 457 | 457 | if ( ! is_object($db) OR ! ($db instanceof CI_DB)) |
| 458 | 458 | { |
| 459 | 459 | class_exists('CI_DB', FALSE) OR $this->database(); |
| 460 | - $db =& $CI->db; |
|
| 460 | + $db = & $CI->db; |
|
| 461 | 461 | } |
| 462 | 462 | |
| 463 | 463 | require_once(BASEPATH.'database/DB_forge.php'); |
@@ -821,7 +821,7 @@ discard block |
||
| 821 | 821 | $this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths; |
| 822 | 822 | |
| 823 | 823 | // Add config file path |
| 824 | - $config =& $this->_ci_get_component('config'); |
|
| 824 | + $config = & $this->_ci_get_component('config'); |
|
| 825 | 825 | $config->_config_paths[] = $path; |
| 826 | 826 | |
| 827 | 827 | return $this; |
@@ -860,7 +860,7 @@ discard block |
||
| 860 | 860 | */ |
| 861 | 861 | public function remove_package_path($path = '') |
| 862 | 862 | { |
| 863 | - $config =& $this->_ci_get_component('config'); |
|
| 863 | + $config = & $this->_ci_get_component('config'); |
|
| 864 | 864 | |
| 865 | 865 | if ($path === '') |
| 866 | 866 | { |
@@ -963,12 +963,12 @@ discard block |
||
| 963 | 963 | |
| 964 | 964 | // This allows anything loaded using $this->load (views, files, etc.) |
| 965 | 965 | // to become accessible from within the Controller and Model functions. |
| 966 | - $_ci_CI =& get_instance(); |
|
| 966 | + $_ci_CI = & get_instance(); |
|
| 967 | 967 | foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var) |
| 968 | 968 | { |
| 969 | 969 | if ( ! isset($this->$_ci_key)) |
| 970 | 970 | { |
| 971 | - $this->$_ci_key =& $_ci_CI->$_ci_key; |
|
| 971 | + $this->$_ci_key = & $_ci_CI->$_ci_key; |
|
| 972 | 972 | } |
| 973 | 973 | } |
| 974 | 974 | |
@@ -1110,7 +1110,7 @@ discard block |
||
| 1110 | 1110 | // return a new instance of the object |
| 1111 | 1111 | if ($object_name !== NULL) |
| 1112 | 1112 | { |
| 1113 | - $CI =& get_instance(); |
|
| 1113 | + $CI = & get_instance(); |
|
| 1114 | 1114 | if ( ! isset($CI->$object_name)) |
| 1115 | 1115 | { |
| 1116 | 1116 | return $this->_ci_init_library($class, '', $params, $object_name); |
@@ -1173,7 +1173,7 @@ discard block |
||
| 1173 | 1173 | // return a new instance of the object |
| 1174 | 1174 | if ($object_name !== NULL) |
| 1175 | 1175 | { |
| 1176 | - $CI =& get_instance(); |
|
| 1176 | + $CI = & get_instance(); |
|
| 1177 | 1177 | if ( ! isset($CI->$object_name)) |
| 1178 | 1178 | { |
| 1179 | 1179 | return $this->_ci_init_library($library_name, $prefix, $params, $object_name); |
@@ -1326,7 +1326,7 @@ discard block |
||
| 1326 | 1326 | } |
| 1327 | 1327 | |
| 1328 | 1328 | // Don't overwrite existing properties |
| 1329 | - $CI =& get_instance(); |
|
| 1329 | + $CI = & get_instance(); |
|
| 1330 | 1330 | if (isset($CI->$object_name)) |
| 1331 | 1331 | { |
| 1332 | 1332 | if ($CI->$object_name instanceof $class_name) |
@@ -1477,7 +1477,7 @@ discard block |
||
| 1477 | 1477 | */ |
| 1478 | 1478 | protected function &_ci_get_component($component) |
| 1479 | 1479 | { |
| 1480 | - $CI =& get_instance(); |
|
| 1480 | + $CI = & get_instance(); |
|
| 1481 | 1481 | return $CI->$component; |
| 1482 | 1482 | } |
| 1483 | 1483 | } |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | public function enableHooks() |
| 117 | 117 | { |
| 118 | 118 | $this->enableHooks = true; |
| 119 | - $this->hooks =& load_class('Hooks', 'core'); |
|
| 119 | + $this->hooks = & load_class('Hooks', 'core'); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | /** |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | { |
| 163 | 163 | set_status_header($e->getCode()); |
| 164 | 164 | } |
| 165 | - $CI =& get_instance(); |
|
| 165 | + $CI = & get_instance(); |
|
| 166 | 166 | $CI->output->_status['redirect'] = $e->getMessage(); |
| 167 | 167 | } |
| 168 | 168 | // show_404() |
@@ -224,17 +224,17 @@ discard block |
||
| 224 | 224 | $this->setRawInputStream($request_params); |
| 225 | 225 | |
| 226 | 226 | // 404 checking |
| 227 | - if (! class_exists($class) || ! method_exists($class, $method)) |
|
| 227 | + if ( ! class_exists($class) || ! method_exists($class, $method)) |
|
| 228 | 228 | { |
| 229 | 229 | // If 404, CodeIgniter instance is not created yet. So create it here |
| 230 | 230 | // Because we need CI->output->_status to store info |
| 231 | - $CI =& get_instance(); |
|
| 231 | + $CI = & get_instance(); |
|
| 232 | 232 | if ($CI instanceof CIPHPUnitTestNullCodeIgniter) |
| 233 | 233 | { |
| 234 | 234 | CIPHPUnitTest::createCodeIgniterInstance(); |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - show_404($class.'::'.$method . '() is not found'); |
|
| 237 | + show_404($class.'::'.$method.'() is not found'); |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | $params = $argv; |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | { |
| 297 | 297 | if (is_string($string)) |
| 298 | 298 | { |
| 299 | - $INPUT =& load_class('Input', 'core'); |
|
| 299 | + $INPUT = & load_class('Input', 'core'); |
|
| 300 | 300 | CIPHPUnitTestReflection::setPrivateProperty( |
| 301 | 301 | $INPUT, |
| 302 | 302 | '_raw_input_stream', |
@@ -326,12 +326,12 @@ discard block |
||
| 326 | 326 | new CI(); |
| 327 | 327 | } |
| 328 | 328 | $controller = new $class; |
| 329 | - $CI =& get_instance(); |
|
| 329 | + $CI = & get_instance(); |
|
| 330 | 330 | |
| 331 | 331 | // Set CodeIgniter instance to TestCase |
| 332 | 332 | $this->testCase->setCI($CI); |
| 333 | 333 | |
| 334 | - if (! isset($CI->output->_status)) |
|
| 334 | + if ( ! isset($CI->output->_status)) |
|
| 335 | 335 | { |
| 336 | 336 | // Prevent overwriting, if already set in the $class::__construct() |
| 337 | 337 | // Set default response code 200 |
@@ -377,8 +377,8 @@ discard block |
||
| 377 | 377 | */ |
| 378 | 378 | public function getStatus() |
| 379 | 379 | { |
| 380 | - $CI =& get_instance(); |
|
| 381 | - if (! isset($CI->output->_status)) |
|
| 380 | + $CI = & get_instance(); |
|
| 381 | + if ( ! isset($CI->output->_status)) |
|
| 382 | 382 | { |
| 383 | 383 | throw new LogicException('Status code is not set. You must call $this->request() first'); |
| 384 | 384 | } |