@@ -43,26 +43,26 @@ discard block |
||
43 | 43 | $cwd_backup = getcwd(); |
44 | 44 | |
45 | 45 | // Load autoloader for ci-phpunit-test |
46 | - require __DIR__ . '/autoloader.php'; |
|
46 | + require __DIR__.'/autoloader.php'; |
|
47 | 47 | |
48 | 48 | self::loadTestCaseClasses(); |
49 | 49 | |
50 | 50 | // Replace a few Common functions |
51 | - require __DIR__ . '/replacing/core/Common.php'; |
|
52 | - require BASEPATH . 'core/Common.php'; |
|
51 | + require __DIR__.'/replacing/core/Common.php'; |
|
52 | + require BASEPATH.'core/Common.php'; |
|
53 | 53 | |
54 | 54 | // Workaround for missing CodeIgniter's error handler |
55 | 55 | // See https://github.com/kenjis/ci-phpunit-test/issues/37 |
56 | 56 | set_error_handler('_error_handler'); |
57 | 57 | |
58 | 58 | // Load new functions of CIPHPUnitTest |
59 | - require __DIR__ . '/functions.php'; |
|
59 | + require __DIR__.'/functions.php'; |
|
60 | 60 | // Load ci-phpunit-test CI_Loader |
61 | - require __DIR__ . '/replacing/core/Loader.php'; |
|
61 | + require __DIR__.'/replacing/core/Loader.php'; |
|
62 | 62 | // Load ci-phpunit-test CI_Input |
63 | - require __DIR__ . '/replacing/core/Input.php'; |
|
63 | + require __DIR__.'/replacing/core/Input.php'; |
|
64 | 64 | // Load ci-phpunit-test CI_Output |
65 | - require __DIR__ . '/replacing/core/Output.php'; |
|
65 | + require __DIR__.'/replacing/core/Output.php'; |
|
66 | 66 | |
67 | 67 | // Change current directory |
68 | 68 | chdir(FCPATH); |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | self::loadCodeIgniter(); |
71 | 71 | |
72 | 72 | // Create CodeIgniter instance |
73 | - if (! self::wiredesignzHmvcInstalled()) |
|
73 | + if ( ! self::wiredesignzHmvcInstalled()) |
|
74 | 74 | { |
75 | 75 | new CI_Controller(); |
76 | 76 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | chdir($cwd_backup); |
93 | 93 | } |
94 | 94 | |
95 | - private static function loadCodeIgniter(){ |
|
95 | + private static function loadCodeIgniter() { |
|
96 | 96 | // Load constants.php before replacing helpers, |
97 | 97 | // because config_item() loads config.php |
98 | 98 | if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/constants.php')) |
@@ -115,31 +115,31 @@ discard block |
||
115 | 115 | * |
116 | 116 | * And away we go... |
117 | 117 | */ |
118 | - require __DIR__ . '/replacing/core/CodeIgniter.php'; |
|
118 | + require __DIR__.'/replacing/core/CodeIgniter.php'; |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | private static function defineConstants() |
122 | 122 | { |
123 | - if (! defined('TESTPATH')) { |
|
123 | + if ( ! defined('TESTPATH')) { |
|
124 | 124 | define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR); |
125 | 125 | } |
126 | 126 | // Current Bootstrap.php should define this, but in case it doesn't: |
127 | - if (! defined('CI_PHPUNIT_TESTPATH')) { |
|
127 | + if ( ! defined('CI_PHPUNIT_TESTPATH')) { |
|
128 | 128 | define('CI_PHPUNIT_TESTPATH', dirname(__FILE__).DIRECTORY_SEPARATOR); |
129 | 129 | } |
130 | 130 | } |
131 | 131 | |
132 | 132 | private static function loadTestCaseClasses() |
133 | 133 | { |
134 | - require TESTPATH . 'TestCase.php'; |
|
134 | + require TESTPATH.'TestCase.php'; |
|
135 | 135 | |
136 | - $db_test_case_file = TESTPATH . 'DbTestCase.php'; |
|
136 | + $db_test_case_file = TESTPATH.'DbTestCase.php'; |
|
137 | 137 | if (is_readable($db_test_case_file)) |
138 | 138 | { |
139 | 139 | require $db_test_case_file; |
140 | 140 | } |
141 | 141 | |
142 | - $unit_test_case_file = TESTPATH . 'UnitTestCase.php'; |
|
142 | + $unit_test_case_file = TESTPATH.'UnitTestCase.php'; |
|
143 | 143 | if (is_readable($unit_test_case_file)) |
144 | 144 | { |
145 | 145 | require $unit_test_case_file; |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | */ |
152 | 152 | public static function createCodeIgniterInstance($use_my_controller = false) |
153 | 153 | { |
154 | - if (! self::wiredesignzHmvcInstalled()) |
|
154 | + if ( ! self::wiredesignzHmvcInstalled()) |
|
155 | 155 | { |
156 | 156 | if ($use_my_controller && self::hasMyController()) |
157 | 157 | { |
@@ -176,11 +176,11 @@ discard block |
||
176 | 176 | } |
177 | 177 | |
178 | 178 | $my_controller_file = |
179 | - APPPATH . 'core/' . config_item('subclass_prefix') . 'Controller.php'; |
|
179 | + APPPATH.'core/'.config_item('subclass_prefix').'Controller.php'; |
|
180 | 180 | |
181 | 181 | if (file_exists($my_controller_file)) |
182 | 182 | { |
183 | - $controller_class = config_item('subclass_prefix') . 'Controller'; |
|
183 | + $controller_class = config_item('subclass_prefix').'Controller'; |
|
184 | 184 | if ( ! class_exists($controller_class)) |
185 | 185 | { |
186 | 186 | require $my_controller_file; |
@@ -212,11 +212,11 @@ discard block |
||
212 | 212 | protected static function replaceLoader() |
213 | 213 | { |
214 | 214 | $my_loader_file = |
215 | - APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php'; |
|
215 | + APPPATH.'core/'.config_item('subclass_prefix').'Loader.php'; |
|
216 | 216 | |
217 | 217 | if (file_exists($my_loader_file)) |
218 | 218 | { |
219 | - self::$loader_class = config_item('subclass_prefix') . 'Loader'; |
|
219 | + self::$loader_class = config_item('subclass_prefix').'Loader'; |
|
220 | 220 | if ( ! class_exists(self::$loader_class)) |
221 | 221 | { |
222 | 222 | require $my_loader_file; |
@@ -228,11 +228,11 @@ discard block |
||
228 | 228 | protected static function replaceConfig() |
229 | 229 | { |
230 | 230 | $my_config_file = |
231 | - APPPATH . 'core/' . config_item('subclass_prefix') . 'Config.php'; |
|
231 | + APPPATH.'core/'.config_item('subclass_prefix').'Config.php'; |
|
232 | 232 | |
233 | 233 | if (file_exists($my_config_file)) |
234 | 234 | { |
235 | - self::$config_class = config_item('subclass_prefix') . 'Config'; |
|
235 | + self::$config_class = config_item('subclass_prefix').'Config'; |
|
236 | 236 | if ( ! class_exists(self::$config_class)) |
237 | 237 | { |
238 | 238 | require $my_config_file; |
@@ -251,19 +251,19 @@ discard block |
||
251 | 251 | |
252 | 252 | protected static function loadHelper($helper) |
253 | 253 | { |
254 | - $my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php'; |
|
254 | + $my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php'; |
|
255 | 255 | if (file_exists($my_helper_file)) |
256 | 256 | { |
257 | 257 | require $my_helper_file; |
258 | 258 | } |
259 | - require __DIR__ . '/replacing/helpers/' . $helper . '.php'; |
|
259 | + require __DIR__.'/replacing/helpers/'.$helper.'.php'; |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | public static function setPatcherCacheDir($dir = null) |
263 | 263 | { |
264 | 264 | if ($dir === null) |
265 | 265 | { |
266 | - $dir = CI_PHPUNIT_TESTPATH . 'tmp/cache'; |
|
266 | + $dir = CI_PHPUNIT_TESTPATH.'tmp/cache'; |
|
267 | 267 | } |
268 | 268 | |
269 | 269 | MonkeyPatchManager::setCacheDir( |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | |
280 | 280 | public static function loadConfig() |
281 | 281 | { |
282 | - $config= new self::$config_class; |
|
282 | + $config = new self::$config_class; |
|
283 | 283 | load_class_instance('Config', $config); |
284 | 284 | } |
285 | 285 | } |