Completed
Pull Request — master (#212)
by lucky
02:40
created
application/tests/_ci_phpunit_test/autoloader.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,10 +9,10 @@  discard block
 block discarded – undo
9 9
  */
10 10
 
11 11
 // Autoloader for ci-phpunit-test
12
-require __DIR__ . '/CIPHPUnitTestAutoloader.php';
13
-require __DIR__ . '/CIPHPUnitTestFileCache.php';
12
+require __DIR__.'/CIPHPUnitTestAutoloader.php';
13
+require __DIR__.'/CIPHPUnitTestFileCache.php';
14 14
 $cache = new CIPHPUnitTestFileCache(
15
-	__DIR__ . '/tmp/cache/autoload.php'
15
+	__DIR__.'/tmp/cache/autoload.php'
16 16
 );
17 17
 $autoload_dirs = CIPHPUnitTest::getAutoloadDirs();
18 18
 $autoloader = new CIPHPUnitTestAutoloader($cache, $autoload_dirs);
@@ -20,5 +20,5 @@  discard block
 block discarded – undo
20 20
 
21 21
 // Register CodeIgniter's tests/mocks/autoloader.php
22 22
 define('SYSTEM_PATH', BASEPATH);
23
-require TESTPATH .'mocks/autoloader.php';
23
+require TESTPATH.'mocks/autoloader.php';
24 24
 spl_autoload_register('autoload');
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTest.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -33,30 +33,30 @@  discard block
 block discarded – undo
33 33
 		$cwd_backup = getcwd();
34 34
 
35 35
 		// Load autoloader for ci-phpunit-test
36
-		require __DIR__ . '/autoloader.php';
36
+		require __DIR__.'/autoloader.php';
37 37
 
38
-		require TESTPATH . 'TestCase.php';
38
+		require TESTPATH.'TestCase.php';
39 39
 
40
-		$db_test_case_file = TESTPATH . 'DbTestCase.php';
40
+		$db_test_case_file = TESTPATH.'DbTestCase.php';
41 41
 		if (is_readable($db_test_case_file))
42 42
 		{
43 43
 			require $db_test_case_file;
44 44
 		}
45 45
 
46 46
 		// Replace a few Common functions
47
-		require __DIR__ . '/replacing/core/Common.php';
48
-		require BASEPATH . 'core/Common.php';
47
+		require __DIR__.'/replacing/core/Common.php';
48
+		require BASEPATH.'core/Common.php';
49 49
 
50 50
 		// Workaround for missing CodeIgniter's error handler
51 51
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
52 52
 		set_error_handler('_error_handler');
53 53
 
54 54
 		// Load new functions of CIPHPUnitTest
55
-		require __DIR__ . '/functions.php';
55
+		require __DIR__.'/functions.php';
56 56
 		// Load ci-phpunit-test CI_Loader
57
-		require __DIR__ . '/replacing/core/Loader.php';
57
+		require __DIR__.'/replacing/core/Loader.php';
58 58
 		// Load ci-phpunit-test CI_Input
59
-		require __DIR__ . '/replacing/core/Input.php';
59
+		require __DIR__.'/replacing/core/Input.php';
60 60
 
61 61
 		// Change current directory
62 62
 		chdir(FCPATH);
@@ -68,12 +68,12 @@  discard block
 block discarded – undo
68 68
 		 *
69 69
 		 * And away we go...
70 70
 		 */
71
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
71
+		require __DIR__.'/replacing/core/CodeIgniter.php';
72 72
 
73 73
 		self::replaceHelpers();
74 74
 
75 75
 		// Create CodeIgniter instance
76
-		if (! self::wiredesignzHmvcInstalled())
76
+		if ( ! self::wiredesignzHmvcInstalled())
77 77
 		{
78 78
 			new CI_Controller();
79 79
 		}
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 
95 95
 	public static function createCodeIgniterInstance()
96 96
 	{
97
-		if (! self::wiredesignzHmvcInstalled())
97
+		if ( ! self::wiredesignzHmvcInstalled())
98 98
 		{
99 99
 			new CI_Controller();
100 100
 		}
@@ -123,11 +123,11 @@  discard block
 block discarded – undo
123 123
 	protected static function replaceLoader()
124 124
 	{
125 125
 		$my_loader_file = 
126
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
126
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
127 127
 
128 128
 		if (file_exists($my_loader_file))
129 129
 		{
130
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
130
+			self::$loader_class = config_item('subclass_prefix').'Loader';
131 131
 			if ( ! class_exists(self::$loader_class))
132 132
 			{
133 133
 				require $my_loader_file;
@@ -146,19 +146,19 @@  discard block
 block discarded – undo
146 146
 
147 147
 	protected static function loadHelper($helper)
148 148
 	{
149
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php';
149
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php';
150 150
 		if (file_exists($my_helper_file))
151 151
 		{
152 152
 			require $my_helper_file;
153 153
 		}
154
-		require __DIR__ . '/replacing/helpers/' . $helper . '.php';
154
+		require __DIR__.'/replacing/helpers/'.$helper.'.php';
155 155
 	}
156 156
 
157 157
 	public static function setPatcherCacheDir($dir = null)
158 158
 	{
159 159
 		if ($dir === null)
160 160
 		{
161
-			$dir = TESTPATH . '_ci_phpunit_test/tmp/cache';
161
+			$dir = TESTPATH.'_ci_phpunit_test/tmp/cache';
162 162
 		}
163 163
 
164 164
 		MonkeyPatchManager::setCacheDir(
Please login to merge, or discard this patch.
application/tests/Bootstrap.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
  * NOTE: If you change these, also change the error_reporting() code below
55 55
  */
56 56
 // This `if` statemant is needed for @runInSeparateProcess
57
-if (! defined('ENVIRONMENT'))
57
+if ( ! defined('ENVIRONMENT'))
58 58
 {
59 59
 	define('ENVIRONMENT', 'testing');
60 60
 }
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
234 234
 
235 235
 	// Path to the test directory containing all the test files.
236
-	define('TESTPATH', __dir__.DIRECTORY_SEPARATOR);  // Should be the folder this `Bootstrap.php` file is in.
236
+	define('TESTPATH', __dir__.DIRECTORY_SEPARATOR); // Should be the folder this `Bootstrap.php` file is in.
237 237
 
238 238
 	// Path to the system directory
239 239
 	define('BASEPATH', $system_path);
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
  *  Added for ci-phpunit-test
361 361
  * -------------------------------------------------------------------
362 362
  */
363
-require __DIR__ . '/_ci_phpunit_test/CIPHPUnitTest.php';
363
+require __DIR__.'/_ci_phpunit_test/CIPHPUnitTest.php';
364 364
 CIPHPUnitTest::init();
365 365
 /*
366 366
  * Or you can set directories for autoloading
Please login to merge, or discard this patch.