Completed
Pull Request — master (#165)
by Kenji
02:57
created
application/tests/_ci_phpunit_test/patcher/2.x/Patcher/FunctionPatcher.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__ . '/FunctionPatcher/NodeVisitor.php';
14
-require __DIR__ . '/FunctionPatcher/Proxy.php';
13
+require __DIR__.'/FunctionPatcher/NodeVisitor.php';
14
+require __DIR__.'/FunctionPatcher/Proxy.php';
15 15
 
16 16
 use LogicException;
17 17
 
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/2.x/Patcher/MethodPatcher.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Kenjis\MonkeyPatch\Patcher;
12 12
 
13
-require __DIR__ . '/MethodPatcher/NodeVisitor.php';
14
-require __DIR__ . '/MethodPatcher/PatchManager.php';
13
+require __DIR__.'/MethodPatcher/NodeVisitor.php';
14
+require __DIR__.'/MethodPatcher/PatchManager.php';
15 15
 
16 16
 use LogicException;
17 17
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 			{
56 56
 				if ($start_method && $token === '{')
57 57
 				{
58
-					$new_source .= '{ ' . self::CODE;
58
+					$new_source .= '{ '.self::CODE;
59 59
 					$start_method = false;
60 60
 					$replacement = each(self::$replacement);
61 61
 				}
Please login to merge, or discard this patch.
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.
application/tests/_ci_phpunit_test/patcher/bootstrap.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -12,25 +12,25 @@
 block discarded – undo
12 12
 	// Autoloader for PHP-Parser
13 13
 	// Don't use `require`, because we must require it in CIPHPUnitTest::init()
14 14
 	// for providing autoloading when we don't use Monkey Patching
15
-	require_once __DIR__ . '/third_party/PHP-Parser-3.0.2/lib/bootstrap.php';
15
+	require_once __DIR__.'/third_party/PHP-Parser-3.0.2/lib/bootstrap.php';
16 16
 
17
-	require __DIR__ . '/3.x/MonkeyPatchManager.php';
17
+	require __DIR__.'/3.x/MonkeyPatchManager.php';
18 18
 } else {
19 19
 	// Autoloader for PHP-Parser
20 20
 	// Don't use `require`, because we must require it in CIPHPUnitTest::init()
21 21
 	// for providing autoloading when we don't use Monkey Patching
22
-	require_once __DIR__ . '/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
22
+	require_once __DIR__.'/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
23 23
 	
24
-	require __DIR__ . '/2.x/MonkeyPatchManager.php';
24
+	require __DIR__.'/2.x/MonkeyPatchManager.php';
25 25
 }
26 26
 
27
-require __DIR__ . '/IncludeStream.php';
28
-require __DIR__ . '/PathChecker.php';
29
-require __DIR__ . '/MonkeyPatch.php';
30
-require __DIR__ . '/Cache.php';
31
-require __DIR__ . '/InvocationVerifier.php';
27
+require __DIR__.'/IncludeStream.php';
28
+require __DIR__.'/PathChecker.php';
29
+require __DIR__.'/MonkeyPatch.php';
30
+require __DIR__.'/Cache.php';
31
+require __DIR__.'/InvocationVerifier.php';
32 32
 
33
-require __DIR__ . '/functions/exit__.php';
33
+require __DIR__.'/functions/exit__.php';
34 34
 
35 35
 const __GO_TO_ORIG__ = '__GO_TO_ORIG__';
36 36
 
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.