@@ -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 |
@@ -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 | $silent = false; |
14 | 14 | $app_dir = 'application'; |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | public static function log($message) |
39 | 39 | { |
40 | - if (! self::$debug) |
|
40 | + if ( ! self::$debug) |
|
41 | 41 | { |
42 | 42 | return; |
43 | 43 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | } |
73 | 73 | if (self::$debug) |
74 | 74 | { |
75 | - self::$log_file = __DIR__ . '/debug.log'; |
|
75 | + self::$log_file = __DIR__.'/debug.log'; |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
@@ -85,10 +85,10 @@ discard block |
||
85 | 85 | else |
86 | 86 | { |
87 | 87 | // APPPATH is constant in CodeIgniter |
88 | - Cache::setProjectRootDir(APPPATH . '../'); |
|
88 | + Cache::setProjectRootDir(APPPATH.'../'); |
|
89 | 89 | } |
90 | 90 | |
91 | - if (! isset($config['cache_dir'])) |
|
91 | + if ( ! isset($config['cache_dir'])) |
|
92 | 92 | { |
93 | 93 | throw new LogicException('You have to set "cache_dir"'); |
94 | 94 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | |
98 | 98 | protected static function setPaths(array $config) |
99 | 99 | { |
100 | - if (! isset($config['include_paths'])) |
|
100 | + if ( ! isset($config['include_paths'])) |
|
101 | 101 | { |
102 | 102 | throw new LogicException('You have to set "include_paths"'); |
103 | 103 | } |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | // Updated? |
159 | 159 | if ($cached !== $current) |
160 | 160 | { |
161 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
161 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
162 | 162 | Cache::clearSrcCache(); |
163 | 163 | Cache::writeTmpIncludePaths($current); |
164 | 164 | } |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | // Updated? |
170 | 170 | if ($cached !== $current) |
171 | 171 | { |
172 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
172 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
173 | 173 | Cache::clearSrcCache(); |
174 | 174 | Cache::writeTmpExcludePaths($current); |
175 | 175 | } |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | // Updated? |
183 | 183 | if ($cached !== self::$patcher_list) |
184 | 184 | { |
185 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
185 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
186 | 186 | Cache::clearSrcCache(); |
187 | 187 | Cache::writeTmpPatcherList(self::$patcher_list); |
188 | 188 | } |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | // Updated? |
197 | 197 | if ($cached !== $current) |
198 | 198 | { |
199 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
199 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
200 | 200 | Cache::clearSrcCache(); |
201 | 201 | Cache::writeTmpFunctionWhitelist($current); |
202 | 202 | } |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | */ |
259 | 259 | public static function patch($path) |
260 | 260 | { |
261 | - if (! is_readable($path)) |
|
261 | + if ( ! is_readable($path)) |
|
262 | 262 | { |
263 | 263 | throw new LogicException("Can't read '$path'"); |
264 | 264 | } |
@@ -266,17 +266,17 @@ discard block |
||
266 | 266 | // Check cache file |
267 | 267 | if ($cache_file = Cache::getValidSrcCachePath($path)) |
268 | 268 | { |
269 | - self::log('cache_hit: ' . $path); |
|
269 | + self::log('cache_hit: '.$path); |
|
270 | 270 | return fopen($cache_file, 'r'); |
271 | 271 | } |
272 | 272 | |
273 | - self::log('cache_miss: ' . $path); |
|
273 | + self::log('cache_miss: '.$path); |
|
274 | 274 | $source = file_get_contents($path); |
275 | 275 | |
276 | 276 | list($new_source, $patched) = self::execPatchers($source); |
277 | 277 | |
278 | 278 | // Write to cache file |
279 | - self::log('write_cache: ' . $path); |
|
279 | + self::log('write_cache: '.$path); |
|
280 | 280 | Cache::writeSrcCacheFile($path, $new_source); |
281 | 281 | |
282 | 282 | $resource = fopen('php://memory', 'rb+'); |
@@ -292,12 +292,12 @@ discard block |
||
292 | 292 | return; |
293 | 293 | } |
294 | 294 | |
295 | - require __DIR__ . '/Patcher/AbstractPatcher.php'; |
|
296 | - require __DIR__ . '/Patcher/Backtrace.php'; |
|
295 | + require __DIR__.'/Patcher/AbstractPatcher.php'; |
|
296 | + require __DIR__.'/Patcher/Backtrace.php'; |
|
297 | 297 | |
298 | 298 | foreach (self::$patcher_list as $classname) |
299 | 299 | { |
300 | - require __DIR__ . '/Patcher/' . $classname . '.php'; |
|
300 | + require __DIR__.'/Patcher/'.$classname.'.php'; |
|
301 | 301 | } |
302 | 302 | |
303 | 303 | self::$load_patchers = true; |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | $patched = false; |
309 | 309 | foreach (self::$patcher_list as $classname) |
310 | 310 | { |
311 | - $classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname; |
|
311 | + $classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname; |
|
312 | 312 | $patcher = new $classname; |
313 | 313 | list($source, $patched_this) = $patcher->patch($source); |
314 | 314 | $patched = $patched || $patched_this; |
@@ -10,34 +10,34 @@ |
||
10 | 10 | |
11 | 11 | // If you use Composer |
12 | 12 | if (class_exists('PhpParser\Autoloader')) { |
13 | - if (method_exists('PhpParser\Node\Name','set')) { |
|
13 | + if (method_exists('PhpParser\Node\Name', 'set')) { |
|
14 | 14 | // PHP-Parser 2.x |
15 | - require __DIR__ . '/2.x/MonkeyPatchManager.php'; |
|
15 | + require __DIR__.'/2.x/MonkeyPatchManager.php'; |
|
16 | 16 | } else { |
17 | 17 | // PHP-Parser 3.x |
18 | - require __DIR__ . '/3.x/MonkeyPatchManager.php'; |
|
18 | + require __DIR__.'/3.x/MonkeyPatchManager.php'; |
|
19 | 19 | } |
20 | 20 | } |
21 | 21 | // If you don't use Composer |
22 | 22 | else { |
23 | 23 | if (version_compare(PHP_VERSION, '5.5.0', '>=')) { |
24 | 24 | // Use PHP-Parser 3.x |
25 | - require __DIR__ . '/third_party/PHP-Parser-3.0.3/lib/bootstrap.php'; |
|
26 | - require __DIR__ . '/3.x/MonkeyPatchManager.php'; |
|
25 | + require __DIR__.'/third_party/PHP-Parser-3.0.3/lib/bootstrap.php'; |
|
26 | + require __DIR__.'/3.x/MonkeyPatchManager.php'; |
|
27 | 27 | } else { |
28 | 28 | // Use PHP-Parser 2.x |
29 | - require __DIR__ . '/third_party/PHP-Parser-2.1.1/lib/bootstrap.php'; |
|
30 | - require __DIR__ . '/2.x/MonkeyPatchManager.php'; |
|
29 | + require __DIR__.'/third_party/PHP-Parser-2.1.1/lib/bootstrap.php'; |
|
30 | + require __DIR__.'/2.x/MonkeyPatchManager.php'; |
|
31 | 31 | } |
32 | 32 | } |
33 | 33 | |
34 | -require __DIR__ . '/IncludeStream.php'; |
|
35 | -require __DIR__ . '/PathChecker.php'; |
|
36 | -require __DIR__ . '/MonkeyPatch.php'; |
|
37 | -require __DIR__ . '/Cache.php'; |
|
38 | -require __DIR__ . '/InvocationVerifier.php'; |
|
34 | +require __DIR__.'/IncludeStream.php'; |
|
35 | +require __DIR__.'/PathChecker.php'; |
|
36 | +require __DIR__.'/MonkeyPatch.php'; |
|
37 | +require __DIR__.'/Cache.php'; |
|
38 | +require __DIR__.'/InvocationVerifier.php'; |
|
39 | 39 | |
40 | -require __DIR__ . '/functions/exit__.php'; |
|
40 | +require __DIR__.'/functions/exit__.php'; |
|
41 | 41 | |
42 | 42 | const __GO_TO_ORIG__ = '__GO_TO_ORIG__'; |
43 | 43 |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | */ |
10 | 10 | |
11 | 11 | // Support PHPUnit 6.0 |
12 | -if (! class_exists('PHPUnit_Framework_TestCase')) |
|
12 | +if ( ! class_exists('PHPUnit_Framework_TestCase')) |
|
13 | 13 | { |
14 | 14 | class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase'); |
15 | 15 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | return $this->$name; |
56 | 56 | } |
57 | 57 | |
58 | - throw new LogicException('No such property: ' . $name); |
|
58 | + throw new LogicException('No such property: '.$name); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | public static function setUpBeforeClass() |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | { |
79 | 79 | reset_instance(); |
80 | 80 | CIPHPUnitTest::createCodeIgniterInstance(); |
81 | - $this->CI =& get_instance(); |
|
81 | + $this->CI = & get_instance(); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | /** |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | { |
92 | 92 | reset_instance(); |
93 | 93 | $controller = new $classname; |
94 | - $this->CI =& get_instance(); |
|
94 | + $this->CI = & get_instance(); |
|
95 | 95 | return $controller; |
96 | 96 | } |
97 | 97 | |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | $this->assertSame( |
314 | 314 | $code, |
315 | 315 | $actual, |
316 | - 'Status code is not ' . $code . ' but ' . $actual . '.' |
|
316 | + 'Status code is not '.$code.' but '.$actual.'.' |
|
317 | 317 | ); |
318 | 318 | } |
319 | 319 | |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | */ |
326 | 326 | public function assertResponseHeader($name, $value) |
327 | 327 | { |
328 | - $CI =& get_instance(); |
|
328 | + $CI = & get_instance(); |
|
329 | 329 | $actual = $CI->output->get_header($name); |
330 | 330 | |
331 | 331 | if ($actual === null) |
@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | */ |
350 | 350 | public function assertResponseCookie($name, $value, $allow_duplicate = false) |
351 | 351 | { |
352 | - $CI =& get_instance(); |
|
352 | + $CI = & get_instance(); |
|
353 | 353 | $cookies = isset($CI->output->_cookies[$name]) |
354 | 354 | ? $CI->output->_cookies[$name] : null; |
355 | 355 | |
@@ -407,23 +407,23 @@ discard block |
||
407 | 407 | $this->fail('redirect() is not called.'); |
408 | 408 | } |
409 | 409 | |
410 | - if (! function_exists('site_url')) |
|
410 | + if ( ! function_exists('site_url')) |
|
411 | 411 | { |
412 | - $CI =& get_instance(); |
|
412 | + $CI = & get_instance(); |
|
413 | 413 | $CI->load->helper('url'); |
414 | 414 | } |
415 | 415 | |
416 | - if (! preg_match('#^(\w+:)?//#i', $uri)) |
|
416 | + if ( ! preg_match('#^(\w+:)?//#i', $uri)) |
|
417 | 417 | { |
418 | 418 | $uri = site_url($uri); |
419 | 419 | } |
420 | 420 | $absolute_url = $uri; |
421 | - $expected = 'Redirect to ' . $absolute_url; |
|
421 | + $expected = 'Redirect to '.$absolute_url; |
|
422 | 422 | |
423 | 423 | $this->assertSame( |
424 | 424 | $expected, |
425 | 425 | $status['redirect'], |
426 | - 'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.' |
|
426 | + 'URL to redirect is not '.$expected.' but '.$status['redirect'].'.' |
|
427 | 427 | ); |
428 | 428 | |
429 | 429 | if ($code !== null) |
@@ -431,7 +431,7 @@ discard block |
||
431 | 431 | $this->assertSame( |
432 | 432 | $code, |
433 | 433 | $status['code'], |
434 | - 'Status code is not ' . $code . ' but ' . $status['code'] . '.' |
|
434 | + 'Status code is not '.$code.' but '.$status['code'].'.' |
|
435 | 435 | ); |
436 | 436 | } |
437 | 437 | } |
@@ -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 |