@@ -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(); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | // methods in it. But we can't use them in |
| 45 | 45 | // `$this->request->setCallablePreConstructor()` |
| 46 | 46 | $mock = $this->testCase->getMockBuilder($classname); |
| 47 | - if (! $enable_constructor) |
|
| 47 | + if ( ! $enable_constructor) |
|
| 48 | 48 | { |
| 49 | 49 | $mock->disableOriginalConstructor(); |
| 50 | 50 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | break; |
| 97 | 97 | default: |
| 98 | 98 | throw new RuntimeException( |
| 99 | - 'Sorry, ' . $count . ' params not implemented yet' |
|
| 99 | + 'Sorry, '.$count.' params not implemented yet' |
|
| 100 | 100 | ); |
| 101 | 101 | } |
| 102 | 102 | } |
@@ -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 | |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | is_loaded('', TRUE); |
| 30 | 30 | |
| 31 | 31 | // Close db connection |
| 32 | - $CI =& get_instance(); |
|
| 32 | + $CI = & get_instance(); |
|
| 33 | 33 | if (isset($CI->db)) |
| 34 | 34 | { |
| 35 | 35 | if ( |
@@ -49,25 +49,25 @@ discard block |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // Load core classes |
| 52 | - $BM =& load_class('Benchmark', 'core'); |
|
| 52 | + $BM = & load_class('Benchmark', 'core'); |
|
| 53 | 53 | CIPHPUnitTestSuperGlobal::set_Global('BM', $BM); |
| 54 | - $EXT =& load_class('Hooks', 'core'); |
|
| 54 | + $EXT = & load_class('Hooks', 'core'); |
|
| 55 | 55 | CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT); |
| 56 | - $CFG =& load_class('Config', 'core'); |
|
| 56 | + $CFG = & load_class('Config', 'core'); |
|
| 57 | 57 | CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG); |
| 58 | - $UNI =& load_class('URI', 'core'); |
|
| 58 | + $UNI = & load_class('URI', 'core'); |
|
| 59 | 59 | CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI); |
| 60 | 60 | // $URI =& load_class('Utf8', 'core'); |
| 61 | 61 | // CIPHPUnitTestSuperGlobal::set_Global('URI', $URI); |
| 62 | - $RTR =& load_class('Router', 'core'); |
|
| 62 | + $RTR = & load_class('Router', 'core'); |
|
| 63 | 63 | CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR); |
| 64 | - $OUT =& load_class('Output', 'core'); |
|
| 64 | + $OUT = & load_class('Output', 'core'); |
|
| 65 | 65 | CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT); |
| 66 | - $SEC =& load_class('Security', 'core'); |
|
| 66 | + $SEC = & load_class('Security', 'core'); |
|
| 67 | 67 | CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC); |
| 68 | - $IN =& load_class('Input', 'core'); |
|
| 68 | + $IN = & load_class('Input', 'core'); |
|
| 69 | 69 | CIPHPUnitTestSuperGlobal::set_Global('IN', $IN); |
| 70 | - $LANG =& load_class('Lang', 'core'); |
|
| 70 | + $LANG = & load_class('Lang', 'core'); |
|
| 71 | 71 | CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG); |
| 72 | 72 | |
| 73 | 73 | CIPHPUnitTest::loadLoader(); |
@@ -31,27 +31,27 @@ 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 | |
| 56 | 56 | // Change current directroy |
| 57 | 57 | chdir(FCPATH); |
@@ -63,12 +63,12 @@ discard block |
||
| 63 | 63 | * |
| 64 | 64 | * And away we go... |
| 65 | 65 | */ |
| 66 | - require __DIR__ . '/replacing/core/CodeIgniter.php'; |
|
| 66 | + require __DIR__.'/replacing/core/CodeIgniter.php'; |
|
| 67 | 67 | |
| 68 | 68 | self::replaceHelpers(); |
| 69 | 69 | |
| 70 | 70 | // Create CodeIgniter instance |
| 71 | - if (! self::wiredesignzHmvcInstalled()) |
|
| 71 | + if ( ! self::wiredesignzHmvcInstalled()) |
|
| 72 | 72 | { |
| 73 | 73 | new CI_Controller(); |
| 74 | 74 | } |
@@ -102,11 +102,11 @@ discard block |
||
| 102 | 102 | protected static function replaceLoader() |
| 103 | 103 | { |
| 104 | 104 | $my_loader_file = |
| 105 | - APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php'; |
|
| 105 | + APPPATH.'core/'.config_item('subclass_prefix').'Loader.php'; |
|
| 106 | 106 | |
| 107 | 107 | if (file_exists($my_loader_file)) |
| 108 | 108 | { |
| 109 | - self::$loader_class = config_item('subclass_prefix') . 'Loader'; |
|
| 109 | + self::$loader_class = config_item('subclass_prefix').'Loader'; |
|
| 110 | 110 | if ( ! class_exists(self::$loader_class)) |
| 111 | 111 | { |
| 112 | 112 | require $my_loader_file; |
@@ -117,19 +117,19 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | protected static function replaceHelpers() |
| 119 | 119 | { |
| 120 | - $my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . 'url_helper.php'; |
|
| 120 | + $my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').'url_helper.php'; |
|
| 121 | 121 | if (file_exists($my_helper_file)) |
| 122 | 122 | { |
| 123 | 123 | require $my_helper_file; |
| 124 | 124 | } |
| 125 | - require __DIR__ . '/replacing/helpers/url_helper.php'; |
|
| 125 | + require __DIR__.'/replacing/helpers/url_helper.php'; |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | public static function setPatcherCacheDir($dir = null) |
| 129 | 129 | { |
| 130 | 130 | if ($dir === null) |
| 131 | 131 | { |
| 132 | - $dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache'; |
|
| 132 | + $dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache'; |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | MonkeyPatchManager::setCacheDir( |
@@ -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) |
@@ -286,18 +286,18 @@ discard block |
||
| 286 | 286 | $this->fail('redirect() is not called.'); |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | - if (! function_exists('site_url')) |
|
| 289 | + if ( ! function_exists('site_url')) |
|
| 290 | 290 | { |
| 291 | - $CI =& get_instance(); |
|
| 291 | + $CI = & get_instance(); |
|
| 292 | 292 | $CI->load->helper('url'); |
| 293 | 293 | } |
| 294 | 294 | $absolute_url = site_url($uri); |
| 295 | - $expected = 'Redirect to ' . $absolute_url; |
|
| 295 | + $expected = 'Redirect to '.$absolute_url; |
|
| 296 | 296 | |
| 297 | 297 | $this->assertSame( |
| 298 | 298 | $expected, |
| 299 | 299 | $status['redirect'], |
| 300 | - 'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.' |
|
| 300 | + 'URL to redirect is not '.$expected.' but '.$status['redirect'].'.' |
|
| 301 | 301 | ); |
| 302 | 302 | |
| 303 | 303 | if ($code !== null) |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | $this->assertSame( |
| 306 | 306 | $code, |
| 307 | 307 | $status['code'], |
| 308 | - 'Status code is not ' . $code . ' but ' . $status['code'] . '.' |
|
| 308 | + 'Status code is not '.$code.' but '.$status['code'].'.' |
|
| 309 | 309 | ); |
| 310 | 310 | } |
| 311 | 311 | } |