Completed
Pull Request — master (#327)
by
unknown
02:25
created
application/tests/_ci_phpunit_test/CIPHPUnitTest.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
28 28
 	 */
29 29
 	public static function init(array $autoload_dirs = null)
30 30
 	{
31
-		if (! defined('TESTPATH')) {
31
+		if ( ! defined('TESTPATH')) {
32 32
 			define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR);
33 33
 		}
34 34
 		// Current Bootstrap.php should define this, but in case it doesn't:
35
-		if (! defined('CI_PHPUNIT_TESTPATH')) {
35
+		if ( ! defined('CI_PHPUNIT_TESTPATH')) {
36 36
 			define('CI_PHPUNIT_TESTPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
37 37
 		}
38 38
 
@@ -49,38 +49,38 @@  discard block
 block discarded – undo
49 49
 		$cwd_backup = getcwd();
50 50
 
51 51
 		// Load autoloader for ci-phpunit-test
52
-		require __DIR__ . '/autoloader.php';
52
+		require __DIR__.'/autoloader.php';
53 53
 
54
-		require TESTPATH . 'TestCase.php';
54
+		require TESTPATH.'TestCase.php';
55 55
 
56
-		$db_test_case_file = TESTPATH . 'DbTestCase.php';
56
+		$db_test_case_file = TESTPATH.'DbTestCase.php';
57 57
 		if (is_readable($db_test_case_file))
58 58
 		{
59 59
 			require $db_test_case_file;
60 60
 		}
61 61
 
62
-		$unit_test_case_file = TESTPATH . 'UnitTestCase.php';
62
+		$unit_test_case_file = TESTPATH.'UnitTestCase.php';
63 63
 		if (is_readable($unit_test_case_file))
64 64
 		{
65 65
 			require $unit_test_case_file;
66 66
 		}
67 67
 
68 68
 		// Replace a few Common functions
69
-		require __DIR__ . '/replacing/core/Common.php';
70
-		require BASEPATH . 'core/Common.php';
69
+		require __DIR__.'/replacing/core/Common.php';
70
+		require BASEPATH.'core/Common.php';
71 71
 
72 72
 		// Workaround for missing CodeIgniter's error handler
73 73
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
74 74
 		set_error_handler('_error_handler');
75 75
 
76 76
 		// Load new functions of CIPHPUnitTest
77
-		require __DIR__ . '/functions.php';
77
+		require __DIR__.'/functions.php';
78 78
 		// Load ci-phpunit-test CI_Loader
79
-		require __DIR__ . '/replacing/core/Loader.php';
79
+		require __DIR__.'/replacing/core/Loader.php';
80 80
 		// Load ci-phpunit-test CI_Input
81
-		require __DIR__ . '/replacing/core/Input.php';
81
+		require __DIR__.'/replacing/core/Input.php';
82 82
 		// Load ci-phpunit-test CI_Output
83
-		require __DIR__ . '/replacing/core/Output.php';
83
+		require __DIR__.'/replacing/core/Output.php';
84 84
 
85 85
 		// Change current directory
86 86
 		chdir(FCPATH);
@@ -95,10 +95,10 @@  discard block
 block discarded – undo
95 95
 		 *
96 96
 		 * And away we go...
97 97
 		 */
98
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
98
+		require __DIR__.'/replacing/core/CodeIgniter.php';
99 99
 
100 100
 		// Create CodeIgniter instance
101
-		if (! self::wiredesignzHmvcInstalled())
101
+		if ( ! self::wiredesignzHmvcInstalled())
102 102
 		{
103 103
 			new CI_Controller();
104 104
 		}
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 	 */
125 125
 	public static function createCodeIgniterInstance($use_my_controller = false)
126 126
 	{
127
-		if (! self::wiredesignzHmvcInstalled())
127
+		if ( ! self::wiredesignzHmvcInstalled())
128 128
 		{
129 129
 			if ($use_my_controller && self::hasMyController())
130 130
 			{
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
149 149
 		}
150 150
 
151 151
 		$my_controller_file =
152
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Controller.php';
152
+			APPPATH.'core/'.config_item('subclass_prefix').'Controller.php';
153 153
 
154 154
 		if (file_exists($my_controller_file))
155 155
 		{
156
-			$controller_class = config_item('subclass_prefix') . 'Controller';
156
+			$controller_class = config_item('subclass_prefix').'Controller';
157 157
 			if ( ! class_exists($controller_class))
158 158
 			{
159 159
 				require $my_controller_file;
@@ -185,11 +185,11 @@  discard block
 block discarded – undo
185 185
 	protected static function replaceLoader()
186 186
 	{
187 187
 		$my_loader_file =
188
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
188
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
189 189
 
190 190
 		if (file_exists($my_loader_file))
191 191
 		{
192
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
192
+			self::$loader_class = config_item('subclass_prefix').'Loader';
193 193
 			if ( ! class_exists(self::$loader_class))
194 194
 			{
195 195
 				require $my_loader_file;
@@ -200,11 +200,11 @@  discard block
 block discarded – undo
200 200
 	protected static function replaceConfig()
201 201
 	{
202 202
 		$my_config_file =
203
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Config.php';
203
+			APPPATH.'core/'.config_item('subclass_prefix').'Config.php';
204 204
 
205 205
 		if (file_exists($my_config_file))
206 206
 		{
207
-			self::$config_class = config_item('subclass_prefix') . 'Config';
207
+			self::$config_class = config_item('subclass_prefix').'Config';
208 208
 			if ( ! class_exists(self::$config_class))
209 209
 			{
210 210
 				require $my_config_file;
@@ -223,19 +223,19 @@  discard block
 block discarded – undo
223 223
 
224 224
 	protected static function loadHelper($helper)
225 225
 	{
226
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php';
226
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php';
227 227
 		if (file_exists($my_helper_file))
228 228
 		{
229 229
 			require $my_helper_file;
230 230
 		}
231
-		require __DIR__ . '/replacing/helpers/' . $helper . '.php';
231
+		require __DIR__.'/replacing/helpers/'.$helper.'.php';
232 232
 	}
233 233
 
234 234
 	public static function setPatcherCacheDir($dir = null)
235 235
 	{
236 236
 		if ($dir === null)
237 237
 		{
238
-			$dir = CI_PHPUNIT_TESTPATH . 'tmp/cache';
238
+			$dir = CI_PHPUNIT_TESTPATH.'tmp/cache';
239 239
 		}
240 240
 
241 241
 		MonkeyPatchManager::setCacheDir(
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 	}
251 251
 	public static function loadConfig()
252 252
 	{
253
-		$config= new self::$config_class;
253
+		$config = new self::$config_class;
254 254
 		load_class_instance('Config', $config);
255 255
 	}
256 256
 }
Please login to merge, or discard this patch.