@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | /** |
| 234 | 234 | * Fetch an item from the GET array |
| 235 | 235 | * |
| 236 | - * @param mixed $index Index for item to be fetched from $_GET |
|
| 236 | + * @param string $index Index for item to be fetched from $_GET |
|
| 237 | 237 | * @param bool $xss_clean Whether to apply XSS filtering |
| 238 | 238 | * @return mixed |
| 239 | 239 | */ |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | /** |
| 248 | 248 | * Fetch an item from the POST array |
| 249 | 249 | * |
| 250 | - * @param mixed $index Index for item to be fetched from $_POST |
|
| 250 | + * @param string $index Index for item to be fetched from $_POST |
|
| 251 | 251 | * @param bool $xss_clean Whether to apply XSS filtering |
| 252 | 252 | * @return mixed |
| 253 | 253 | */ |
@@ -307,9 +307,9 @@ discard block |
||
| 307 | 307 | /** |
| 308 | 308 | * Fetch an item from the SERVER array |
| 309 | 309 | * |
| 310 | - * @param mixed $index Index for item to be fetched from $_SERVER |
|
| 310 | + * @param string $index Index for item to be fetched from $_SERVER |
|
| 311 | 311 | * @param bool $xss_clean Whether to apply XSS filtering |
| 312 | - * @return mixed |
|
| 312 | + * @return string |
|
| 313 | 313 | */ |
| 314 | 314 | public function server($index, $xss_clean = NULL) |
| 315 | 315 | { |
@@ -892,7 +892,7 @@ discard block |
||
| 892 | 892 | * Allows read access to protected properties |
| 893 | 893 | * |
| 894 | 894 | * @param string $name |
| 895 | - * @return mixed |
|
| 895 | + * @return string|null |
|
| 896 | 896 | */ |
| 897 | 897 | public function __get($name) |
| 898 | 898 | { |
@@ -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, |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | return $this->$name; |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - throw new LogicException('No such property: ' . $name); |
|
| 44 | + throw new LogicException('No such property: '.$name); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | public static function setUpBeforeClass() |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | public function resetInstance() |
| 61 | 61 | { |
| 62 | 62 | reset_instance(); |
| 63 | - if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
|
| 63 | + if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
|
| 64 | 64 | { |
| 65 | 65 | new CI_Controller(); |
| 66 | 66 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | new CI(); |
| 70 | 70 | new MX_Controller(); |
| 71 | 71 | } |
| 72 | - $this->CI =& get_instance(); |
|
| 72 | + $this->CI = & get_instance(); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | protected function tearDown() |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | $this->assertSame( |
| 245 | 245 | $code, |
| 246 | 246 | $actual, |
| 247 | - 'Status code is not ' . $code . ' but ' . $actual . '.' |
|
| 247 | + 'Status code is not '.$code.' but '.$actual.'.' |
|
| 248 | 248 | ); |
| 249 | 249 | } |
| 250 | 250 | |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | */ |
| 257 | 257 | public function assertResponseHeader($name, $value) |
| 258 | 258 | { |
| 259 | - $CI =& get_instance(); |
|
| 259 | + $CI = & get_instance(); |
|
| 260 | 260 | $actual = $CI->output->get_header($name); |
| 261 | 261 | |
| 262 | 262 | if ($actual === null) |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | */ |
| 281 | 281 | public function assertResponseCookie($name, $value, $allow_duplicate = false) |
| 282 | 282 | { |
| 283 | - $CI =& get_instance(); |
|
| 283 | + $CI = & get_instance(); |
|
| 284 | 284 | $cookies = isset($CI->output->_cookies[$name]) |
| 285 | 285 | ? $CI->output->_cookies[$name] : null; |
| 286 | 286 | |
@@ -338,18 +338,18 @@ discard block |
||
| 338 | 338 | $this->fail('redirect() is not called.'); |
| 339 | 339 | } |
| 340 | 340 | |
| 341 | - if (! function_exists('site_url')) |
|
| 341 | + if ( ! function_exists('site_url')) |
|
| 342 | 342 | { |
| 343 | - $CI =& get_instance(); |
|
| 343 | + $CI = & get_instance(); |
|
| 344 | 344 | $CI->load->helper('url'); |
| 345 | 345 | } |
| 346 | 346 | $absolute_url = site_url($uri); |
| 347 | - $expected = 'Redirect to ' . $absolute_url; |
|
| 347 | + $expected = 'Redirect to '.$absolute_url; |
|
| 348 | 348 | |
| 349 | 349 | $this->assertSame( |
| 350 | 350 | $expected, |
| 351 | 351 | $status['redirect'], |
| 352 | - 'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.' |
|
| 352 | + 'URL to redirect is not '.$expected.' but '.$status['redirect'].'.' |
|
| 353 | 353 | ); |
| 354 | 354 | |
| 355 | 355 | if ($code !== null) |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | $this->assertSame( |
| 358 | 358 | $code, |
| 359 | 359 | $status['code'], |
| 360 | - 'Status code is not ' . $code . ' but ' . $status['code'] . '.' |
|
| 360 | + 'Status code is not '.$code.' but '.$status['code'].'.' |
|
| 361 | 361 | ); |
| 362 | 362 | } |
| 363 | 363 | } |
@@ -31,29 +31,29 @@ discard block |
||
| 31 | 31 | self::$autoload_dirs = $autoload_dirs; |
| 32 | 32 | |
| 33 | 33 | // Load autoloader for ci-phpunit-test |
| 34 | - require __DIR__ . '/autoloader.php'; |
|
| 34 | + require __DIR__.'/autoloader.php'; |
|
| 35 | 35 | |
| 36 | 36 | // Autoloader for PHP-Parser |
| 37 | 37 | // Don't use `require`, because we may have required already |
| 38 | 38 | // in `patcher/bootstrap.php` |
| 39 | - require_once __DIR__ . '/patcher/third_party/PHP-Parser/lib/bootstrap.php'; |
|
| 39 | + require_once __DIR__.'/patcher/third_party/PHP-Parser/lib/bootstrap.php'; |
|
| 40 | 40 | |
| 41 | - require APPPATH . '/tests/TestCase.php'; |
|
| 41 | + require APPPATH.'/tests/TestCase.php'; |
|
| 42 | 42 | |
| 43 | 43 | // Replace a few Common functions |
| 44 | - require __DIR__ . '/replacing/core/Common.php'; |
|
| 45 | - require BASEPATH . 'core/Common.php'; |
|
| 44 | + require __DIR__.'/replacing/core/Common.php'; |
|
| 45 | + require BASEPATH.'core/Common.php'; |
|
| 46 | 46 | |
| 47 | 47 | // Workaround for missing CodeIgniter's error handler |
| 48 | 48 | // See https://github.com/kenjis/ci-phpunit-test/issues/37 |
| 49 | 49 | set_error_handler('_error_handler'); |
| 50 | 50 | |
| 51 | 51 | // Load new functions of CIPHPUnitTest |
| 52 | - require __DIR__ . '/functions.php'; |
|
| 52 | + require __DIR__.'/functions.php'; |
|
| 53 | 53 | // Load ci-phpunit-test CI_Loader |
| 54 | - require __DIR__ . '/replacing/core/Loader.php'; |
|
| 54 | + require __DIR__.'/replacing/core/Loader.php'; |
|
| 55 | 55 | // Load ci-phpunit-test CI_Input |
| 56 | - require __DIR__ . '/replacing/core/Input.php'; |
|
| 56 | + require __DIR__.'/replacing/core/Input.php'; |
|
| 57 | 57 | |
| 58 | 58 | // Change current directroy |
| 59 | 59 | chdir(FCPATH); |
@@ -65,12 +65,12 @@ discard block |
||
| 65 | 65 | * |
| 66 | 66 | * And away we go... |
| 67 | 67 | */ |
| 68 | - require __DIR__ . '/replacing/core/CodeIgniter.php'; |
|
| 68 | + require __DIR__.'/replacing/core/CodeIgniter.php'; |
|
| 69 | 69 | |
| 70 | 70 | self::replaceHelpers(); |
| 71 | 71 | |
| 72 | 72 | // Create CodeIgniter instance |
| 73 | - if (! self::wiredesignzHmvcInstalled()) |
|
| 73 | + if ( ! self::wiredesignzHmvcInstalled()) |
|
| 74 | 74 | { |
| 75 | 75 | new CI_Controller(); |
| 76 | 76 | } |
@@ -104,11 +104,11 @@ discard block |
||
| 104 | 104 | protected static function replaceLoader() |
| 105 | 105 | { |
| 106 | 106 | $my_loader_file = |
| 107 | - APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php'; |
|
| 107 | + APPPATH.'core/'.config_item('subclass_prefix').'Loader.php'; |
|
| 108 | 108 | |
| 109 | 109 | if (file_exists($my_loader_file)) |
| 110 | 110 | { |
| 111 | - self::$loader_class = config_item('subclass_prefix') . 'Loader'; |
|
| 111 | + self::$loader_class = config_item('subclass_prefix').'Loader'; |
|
| 112 | 112 | if ( ! class_exists(self::$loader_class)) |
| 113 | 113 | { |
| 114 | 114 | require $my_loader_file; |
@@ -119,19 +119,19 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | protected static function replaceHelpers() |
| 121 | 121 | { |
| 122 | - $my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . 'url_helper.php'; |
|
| 122 | + $my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').'url_helper.php'; |
|
| 123 | 123 | if (file_exists($my_helper_file)) |
| 124 | 124 | { |
| 125 | 125 | require $my_helper_file; |
| 126 | 126 | } |
| 127 | - require __DIR__ . '/replacing/helpers/url_helper.php'; |
|
| 127 | + require __DIR__.'/replacing/helpers/url_helper.php'; |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | public static function setPatcherCacheDir($dir = null) |
| 131 | 131 | { |
| 132 | 132 | if ($dir === null) |
| 133 | 133 | { |
| 134 | - $dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache'; |
|
| 134 | + $dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache'; |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | MonkeyPatchManager::setCacheDir( |