@@ -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 |
@@ -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 | } |
@@ -25,7 +25,7 @@ |
||
25 | 25 | public function test_APPPATH() |
26 | 26 | { |
27 | 27 | $actual = realpath(APPPATH); |
28 | - $expected = realpath(__DIR__ . '/../..'); |
|
28 | + $expected = realpath(__DIR__.'/../..'); |
|
29 | 29 | $this->assertEquals( |
30 | 30 | $expected, |
31 | 31 | $actual, |
@@ -102,7 +102,7 @@ |
||
102 | 102 | elseif (strpos($class, 'CI_DB') === 0) |
103 | 103 | { |
104 | 104 | $dir = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR; |
105 | - $file = $dir.str_replace(array('CI_DB','active_record'), array('DB', 'active_rec'), $subclass).'.php'; |
|
105 | + $file = $dir.str_replace(array('CI_DB', 'active_record'), array('DB', 'active_rec'), $subclass).'.php'; |
|
106 | 106 | } |
107 | 107 | else |
108 | 108 | { |
@@ -8,7 +8,7 @@ |
||
8 | 8 | * @link https://github.com/kenjis/ci-phpunit-test |
9 | 9 | */ |
10 | 10 | |
11 | -require __DIR__ . '/Installer.php'; |
|
11 | +require __DIR__.'/Installer.php'; |
|
12 | 12 | |
13 | 13 | $installer = new Installer(); |
14 | 14 | $installer->update(); |
@@ -8,7 +8,7 @@ |
||
8 | 8 | * @link https://github.com/kenjis/ci-phpunit-test |
9 | 9 | */ |
10 | 10 | |
11 | -require __DIR__ . '/Installer.php'; |
|
11 | +require __DIR__.'/Installer.php'; |
|
12 | 12 | |
13 | 13 | $installer = new Installer(); |
14 | 14 | $installer->update(); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | public function enableHooks() |
96 | 96 | { |
97 | 97 | $this->enableHooks = true; |
98 | - $this->hooks =& load_class('Hooks', 'core'); |
|
98 | + $this->hooks = & load_class('Hooks', 'core'); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | { |
142 | 142 | set_status_header($e->getCode()); |
143 | 143 | } |
144 | - $CI =& get_instance(); |
|
144 | + $CI = & get_instance(); |
|
145 | 145 | $CI->output->_status['redirect'] = $e->getMessage(); |
146 | 146 | } |
147 | 147 | // show_404() |
@@ -197,17 +197,17 @@ discard block |
||
197 | 197 | $this->setRawInputStream($request_params); |
198 | 198 | |
199 | 199 | // 404 checking |
200 | - if (! class_exists($class) || ! method_exists($class, $method)) |
|
200 | + if ( ! class_exists($class) || ! method_exists($class, $method)) |
|
201 | 201 | { |
202 | 202 | // If 404, CodeIgniter instance is not created yet. So create it here |
203 | 203 | // Because we need CI->output->_status to store info |
204 | - $CI =& get_instance(); |
|
204 | + $CI = & get_instance(); |
|
205 | 205 | if ($CI === null) |
206 | 206 | { |
207 | 207 | new CI_Controller(); |
208 | 208 | } |
209 | 209 | |
210 | - show_404($class.'::'.$method . '() is not found'); |
|
210 | + show_404($class.'::'.$method.'() is not found'); |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | $params = $argv; |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | { |
267 | 267 | if (is_string($string)) |
268 | 268 | { |
269 | - $INPUT =& load_class('Input', 'core'); |
|
269 | + $INPUT = & load_class('Input', 'core'); |
|
270 | 270 | CIPHPUnitTestReflection::setPrivateProperty( |
271 | 271 | $INPUT, |
272 | 272 | '_raw_input_stream', |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | |
291 | 291 | // Create controller |
292 | 292 | $controller = new $class; |
293 | - $CI =& get_instance(); |
|
293 | + $CI = & get_instance(); |
|
294 | 294 | |
295 | 295 | // Set CodeIgniter instance to TestCase |
296 | 296 | $this->testCase->setCI($CI); |
@@ -330,8 +330,8 @@ discard block |
||
330 | 330 | */ |
331 | 331 | public function getStatus() |
332 | 332 | { |
333 | - $CI =& get_instance(); |
|
334 | - if (! isset($CI->output->_status)) |
|
333 | + $CI = & get_instance(); |
|
334 | + if ( ! isset($CI->output->_status)) |
|
335 | 335 | { |
336 | 336 | throw new LogicException('Status code is not set. You must call $this->request() first'); |
337 | 337 | } |
@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | */ |
20 | 20 | public function getRoute() |
21 | 21 | { |
22 | - $RTR =& load_class('Router', 'core'); |
|
23 | - $URI =& load_class('URI', 'core'); |
|
22 | + $RTR = & load_class('Router', 'core'); |
|
23 | + $URI = & load_class('URI', 'core'); |
|
24 | 24 | |
25 | 25 | $e404 = FALSE; |
26 | 26 | $class = ucfirst($RTR->class); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | { |
58 | 58 | // If 404, CodeIgniter instance is not created yet. So create it here. |
59 | 59 | // Because we need $this->CI->output->_status |
60 | - $CI =& get_instance(); |
|
60 | + $CI = & get_instance(); |
|
61 | 61 | if ($CI === null) |
62 | 62 | { |
63 | 63 | new CI_Controller(); |
@@ -113,7 +113,7 @@ |
||
113 | 113 | */ |
114 | 114 | private static function checkConfigurationFile($file) |
115 | 115 | { |
116 | - if (!file_exists($file)) { |
|
116 | + if ( ! file_exists($file)) { |
|
117 | 117 | throw new \RuntimeException("The requested phpunit configuration was not found at $file"); |
118 | 118 | } |
119 | 119 |