Completed
Push — master ( 5a7b05...96358b )
by Kenji
02:33
created
application/tests/_ci_phpunit_test/patcher/2.x/Patcher/ConstantPatcher.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@
 block discarded – undo
10 10
 
11 11
 namespace Kenjis\MonkeyPatch\Patcher;
12 12
 
13
-require __DIR__ . '/ConstantPatcher/NodeVisitor.php';
14
-require __DIR__ . '/ConstantPatcher/Proxy.php';
13
+require __DIR__.'/ConstantPatcher/NodeVisitor.php';
14
+require __DIR__.'/ConstantPatcher/Proxy.php';
15 15
 
16 16
 use LogicException;
17 17
 
Please login to merge, or discard this patch.
update.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
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
 $silent = false;
14 14
 $app_dir = 'application';
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/2.x/MonkeyPatchManager.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 	public static function log($message)
39 39
 	{
40
-		if (! self::$debug)
40
+		if ( ! self::$debug)
41 41
 		{
42 42
 			return;
43 43
 		}
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 		}
73 73
 		if (self::$debug)
74 74
 		{
75
-			self::$log_file = __DIR__ . '/debug.log';
75
+			self::$log_file = __DIR__.'/debug.log';
76 76
 		}
77 77
 	}
78 78
 
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
85 85
 		else
86 86
 		{
87 87
 			// APPPATH is constant in CodeIgniter
88
-			Cache::setProjectRootDir(APPPATH . '../');
88
+			Cache::setProjectRootDir(APPPATH.'../');
89 89
 		}
90 90
 
91
-		if (! isset($config['cache_dir']))
91
+		if ( ! isset($config['cache_dir']))
92 92
 		{
93 93
 			throw new LogicException('You have to set "cache_dir"');
94 94
 		}
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
 	protected static function setPaths(array $config)
99 99
 	{
100
-		if (! isset($config['include_paths']))
100
+		if ( ! isset($config['include_paths']))
101 101
 		{
102 102
 			throw new LogicException('You have to set "include_paths"');
103 103
 		}
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 		// Updated?
159 159
 		if ($cached !== $current)
160 160
 		{
161
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
161
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
162 162
 			Cache::clearSrcCache();
163 163
 			Cache::writeTmpIncludePaths($current);
164 164
 		}
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 		// Updated?
170 170
 		if ($cached !== $current)
171 171
 		{
172
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
172
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
173 173
 			Cache::clearSrcCache();
174 174
 			Cache::writeTmpExcludePaths($current);
175 175
 		}
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 		// Updated?
183 183
 		if ($cached !== self::$patcher_list)
184 184
 		{
185
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
185
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
186 186
 			Cache::clearSrcCache();
187 187
 			Cache::writeTmpPatcherList(self::$patcher_list);
188 188
 		}
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 		// Updated?
197 197
 		if ($cached !== $current)
198 198
 		{
199
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
199
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
200 200
 			Cache::clearSrcCache();
201 201
 			Cache::writeTmpFunctionWhitelist($current);
202 202
 		}
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 	 */
259 259
 	public static function patch($path)
260 260
 	{
261
-		if (! is_readable($path))
261
+		if ( ! is_readable($path))
262 262
 		{
263 263
 			throw new LogicException("Can't read '$path'");
264 264
 		}
@@ -266,17 +266,17 @@  discard block
 block discarded – undo
266 266
 		// Check cache file
267 267
 		if ($cache_file = Cache::getValidSrcCachePath($path))
268 268
 		{
269
-			self::log('cache_hit: ' . $path);
269
+			self::log('cache_hit: '.$path);
270 270
 			return fopen($cache_file, 'r');
271 271
 		}
272 272
 
273
-		self::log('cache_miss: ' . $path);
273
+		self::log('cache_miss: '.$path);
274 274
 		$source = file_get_contents($path);
275 275
 
276 276
 		list($new_source, $patched) = self::execPatchers($source);
277 277
 
278 278
 		// Write to cache file
279
-		self::log('write_cache: ' . $path);
279
+		self::log('write_cache: '.$path);
280 280
 		Cache::writeSrcCacheFile($path, $new_source);
281 281
 
282 282
 		$resource = fopen('php://memory', 'rb+');
@@ -292,12 +292,12 @@  discard block
 block discarded – undo
292 292
 			return;
293 293
 		}
294 294
 
295
-		require __DIR__ . '/Patcher/AbstractPatcher.php';
296
-		require __DIR__ . '/Patcher/Backtrace.php';
295
+		require __DIR__.'/Patcher/AbstractPatcher.php';
296
+		require __DIR__.'/Patcher/Backtrace.php';
297 297
 
298 298
 		foreach (self::$patcher_list as $classname)
299 299
 		{
300
-			require __DIR__ . '/Patcher/' . $classname . '.php';
300
+			require __DIR__.'/Patcher/'.$classname.'.php';
301 301
 		}
302 302
 
303 303
 		self::$load_patchers = true;
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 		$patched = false;
309 309
 		foreach (self::$patcher_list as $classname)
310 310
 		{
311
-			$classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname;
311
+			$classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname;
312 312
 			$patcher = new $classname;
313 313
 			list($source, $patched_this) = $patcher->patch($source);
314 314
 			$patched = $patched || $patched_this;
Please login to merge, or discard this patch.
install.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
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
 $silent = false;
14 14
 $app_dir = 'application';
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 APPPATH . '/tests/TestCase.php';
38
+		require APPPATH.'/tests/TestCase.php';
39 39
 
40
-		$db_test_case_file = APPPATH . '/tests/DbTestCase.php';
40
+		$db_test_case_file = APPPATH.'/tests/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 directroy
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 = APPPATH . 'tests/_ci_phpunit_test/tmp/cache';
161
+			$dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache';
162 162
 		}
163 163
 
164 164
 		MonkeyPatchManager::setCacheDir(
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/bootstrap.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -10,34 +10,34 @@
 block discarded – undo
10 10
 
11 11
 // If you use Composer
12 12
 if (class_exists('PhpParser\Autoloader')) {
13
-	if (method_exists('PhpParser\Node\Name','set')) {
13
+	if (method_exists('PhpParser\Node\Name', 'set')) {
14 14
 		// PHP-Parser 2.x
15
-		require __DIR__ . '/2.x/MonkeyPatchManager.php';
15
+		require __DIR__.'/2.x/MonkeyPatchManager.php';
16 16
 	} else {
17 17
 		// PHP-Parser 3.x
18
-		require __DIR__ . '/3.x/MonkeyPatchManager.php';
18
+		require __DIR__.'/3.x/MonkeyPatchManager.php';
19 19
 	}
20 20
 }
21 21
 // If you don't use Composer
22 22
 else {
23 23
 	if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
24 24
 		// Use PHP-Parser 3.x
25
-		require __DIR__ . '/third_party/PHP-Parser-3.0.3/lib/bootstrap.php';
26
-		require __DIR__ . '/3.x/MonkeyPatchManager.php';
25
+		require __DIR__.'/third_party/PHP-Parser-3.0.3/lib/bootstrap.php';
26
+		require __DIR__.'/3.x/MonkeyPatchManager.php';
27 27
 	} else {
28 28
 		// Use PHP-Parser 2.x
29
-		require __DIR__ . '/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
30
-		require __DIR__ . '/2.x/MonkeyPatchManager.php';
29
+		require __DIR__.'/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
30
+		require __DIR__.'/2.x/MonkeyPatchManager.php';
31 31
 	}
32 32
 }
33 33
 
34
-require __DIR__ . '/IncludeStream.php';
35
-require __DIR__ . '/PathChecker.php';
36
-require __DIR__ . '/MonkeyPatch.php';
37
-require __DIR__ . '/Cache.php';
38
-require __DIR__ . '/InvocationVerifier.php';
34
+require __DIR__.'/IncludeStream.php';
35
+require __DIR__.'/PathChecker.php';
36
+require __DIR__.'/MonkeyPatch.php';
37
+require __DIR__.'/Cache.php';
38
+require __DIR__.'/InvocationVerifier.php';
39 39
 
40
-require __DIR__ . '/functions/exit__.php';
40
+require __DIR__.'/functions/exit__.php';
41 41
 
42 42
 const __GO_TO_ORIG__ = '__GO_TO_ORIG__';
43 43
 
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  */
10 10
 
11 11
 // Support PHPUnit 6.0
12
-if (! class_exists('PHPUnit_Framework_TestCase'))
12
+if ( ! class_exists('PHPUnit_Framework_TestCase'))
13 13
 {
14 14
 	class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
15 15
 }
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 			return $this->$name;
56 56
 		}
57 57
 
58
-		throw new LogicException('No such property: ' . $name);
58
+		throw new LogicException('No such property: '.$name);
59 59
 	}
60 60
 
61 61
 	public static function setUpBeforeClass()
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	{
79 79
 		reset_instance();
80 80
 		CIPHPUnitTest::createCodeIgniterInstance();
81
-		$this->CI =& get_instance();
81
+		$this->CI = & get_instance();
82 82
 	}
83 83
 
84 84
 	/**
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	{
92 92
 		reset_instance();
93 93
 		$controller = new $classname;
94
-		$this->CI =& get_instance();
94
+		$this->CI = & get_instance();
95 95
 		return $controller;
96 96
 	}
97 97
 
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 		$this->assertSame(
314 314
 			$code,
315 315
 			$actual,
316
-			'Status code is not ' . $code . ' but ' . $actual . '.'
316
+			'Status code is not '.$code.' but '.$actual.'.'
317 317
 		);
318 318
 	}
319 319
 
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
 	 */
326 326
 	public function assertResponseHeader($name, $value)
327 327
 	{
328
-		$CI =& get_instance();
328
+		$CI = & get_instance();
329 329
 		$actual = $CI->output->get_header($name);
330 330
 
331 331
 		if ($actual === null)
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 	 */
350 350
 	public function assertResponseCookie($name, $value, $allow_duplicate = false)
351 351
 	{
352
-		$CI =& get_instance();
352
+		$CI = & get_instance();
353 353
 		$cookies = isset($CI->output->_cookies[$name])
354 354
 			? $CI->output->_cookies[$name] : null;
355 355
 
@@ -407,23 +407,23 @@  discard block
 block discarded – undo
407 407
 			$this->fail('redirect() is not called.');
408 408
 		}
409 409
 
410
-		if (! function_exists('site_url'))
410
+		if ( ! function_exists('site_url'))
411 411
 		{
412
-			$CI =& get_instance();
412
+			$CI = & get_instance();
413 413
 			$CI->load->helper('url');
414 414
 		}
415 415
 
416
-		if (! preg_match('#^(\w+:)?//#i', $uri))
416
+		if ( ! preg_match('#^(\w+:)?//#i', $uri))
417 417
 		{
418 418
 			$uri = site_url($uri);
419 419
 		}
420 420
 		$absolute_url = $uri;
421
-		$expected = 'Redirect to ' . $absolute_url;
421
+		$expected = 'Redirect to '.$absolute_url;
422 422
 
423 423
 		$this->assertSame(
424 424
 			$expected,
425 425
 			$status['redirect'],
426
-			'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.'
426
+			'URL to redirect is not '.$expected.' but '.$status['redirect'].'.'
427 427
 		);
428 428
 
429 429
 		if ($code !== null)
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 			$this->assertSame(
432 432
 				$code,
433 433
 				$status['code'],
434
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
434
+				'Status code is not '.$code.' but '.$status['code'].'.'
435 435
 			);
436 436
 		}
437 437
 	}
Please login to merge, or discard this patch.