Completed
Pull Request — master (#391)
by Kenji
37s
created
application/tests/_ci_phpunit_test/patcher/3.x/Patcher/ExitPatcher.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Kenjis\MonkeyPatch\Patcher;
12 12
 
13
-require __DIR__ . '/../Exception/ExitException.php';
13
+require __DIR__.'/../Exception/ExitException.php';
14 14
 
15 15
 class ExitPatcher
16 16
 {
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 			}
31 31
 			elseif ($token[0] === T_EXIT)
32 32
 			{
33
-				if ($tokens[$i+1] === ';')
33
+				if ($tokens[$i + 1] === ';')
34 34
 				{
35 35
 					$new_source .= 'exit__()';
36 36
 				}
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,20 +27,17 @@
 block discarded – undo
27 27
 			if (is_string($token))
28 28
 			{
29 29
 				$new_source .= $token;
30
-			}
31
-			elseif ($token[0] === T_EXIT)
30
+			} elseif ($token[0] === T_EXIT)
32 31
 			{
33 32
 				if ($tokens[$i+1] === ';')
34 33
 				{
35 34
 					$new_source .= 'exit__()';
36
-				}
37
-				else
35
+				} else
38 36
 				{
39 37
 					$new_source .= 'exit__';
40 38
 				}
41 39
 				$patched = true;
42
-			}
43
-			else
40
+			} else
44 41
 			{
45 42
 				$new_source .= $token[1];
46 43
 			}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/3.x/Patcher/AbstractPatcher.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,7 @@
 block discarded – undo
38 38
 		{
39 39
 			$patched = true;
40 40
 			$new_source = static::generateNewSource($source);
41
-		}
42
-		else
41
+		} else
43 42
 		{
44 43
 			$new_source = $source;
45 44
 		}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/3.x/Patcher/MethodPatcher/NodeVisitor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 {
21 21
 	public function leaveNode(Node $node)
22 22
 	{
23
-		if (! ($node instanceof ClassMethod))
23
+		if ( ! ($node instanceof ClassMethod))
24 24
 		{
25 25
 			return;
26 26
 		}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/3.x/Patcher/MethodPatcher/PatchManager.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,16 +66,16 @@
 block discarded – undo
66 66
 				$called_method = 'n/a';
67 67
 			}
68 68
 			
69
-			$log_args = function () use ($params) {
69
+			$log_args = function() use ($params) {
70 70
 				$output = '';
71 71
 				foreach ($params as $arg) {
72
-					$output .= var_export($arg, true) . ', ';
72
+					$output .= var_export($arg, true).', ';
73 73
 				}
74 74
 				$output = rtrim($output, ', ');
75 75
 				return $output;
76 76
 			};
77 77
 			MonkeyPatchManager::log(
78
-				'invoke_method: ' . $class.'::'.$method . '(' . $log_args() . ') on line ' . $line . ' in ' . $file . ' by ' . $called_method
78
+				'invoke_method: '.$class.'::'.$method.'('.$log_args().') on line '.$line.' in '.$file.' by '.$called_method
79 79
 			);
80 80
 //			var_dump($trace); exit;
81 81
 		}
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -56,12 +56,10 @@  discard block
 block discarded – undo
56 56
 			if (isset($info['class_method']))
57 57
 			{
58 58
 				$called_method = $info['class_method'];
59
-			}
60
-			elseif (isset($info['function']))
59
+			} elseif (isset($info['function']))
61 60
 			{
62 61
 				$called_method = $info['function'];
63
-			}
64
-			else
62
+			} else
65 63
 			{
66 64
 				$called_method = 'n/a';
67 65
 			}
@@ -88,8 +86,7 @@  discard block
 block discarded – undo
88 86
 		)
89 87
 		{
90 88
 			$patch = self::$patches[$class][$method];
91
-		}
92
-		else
89
+		} else
93 90
 		{
94 91
 			return __GO_TO_ORIG__;
95 92
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/3.x/Patcher/Backtrace.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 	public static function getInfo($patcher, $backtrace)
23 23
 	{
24
-		if (! isset(self::$map[$patcher]))
24
+		if ( ! isset(self::$map[$patcher]))
25 25
 		{
26 26
 			throw new LogicException("No such a patcher: $patcher");
27 27
 		}
@@ -41,12 +41,12 @@  discard block
 block discarded – undo
41 41
 		$line = isset($backtrace[$offset]['line'])
42 42
 				? $backtrace[$offset]['line'] : null;
43 43
 
44
-		if (isset($backtrace[$offset+2]))
44
+		if (isset($backtrace[$offset + 2]))
45 45
 		{
46
-			$class  = isset($backtrace[$offset+2]['class'])
47
-					? $backtrace[$offset+2]['class']
46
+			$class = isset($backtrace[$offset + 2]['class'])
47
+					? $backtrace[$offset + 2]['class']
48 48
 					: null;
49
-			$function = $backtrace[$offset+2]['function'];
49
+			$function = $backtrace[$offset + 2]['function'];
50 50
 		}
51 51
 		else
52 52
 		{
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		if (isset($class))
58 58
 		{
59 59
 			$method = $function;
60
-			$class_method = $class . '::' . $function;
60
+			$class_method = $class.'::'.$function;
61 61
 			$function = null;
62 62
 		}
63 63
 		else
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,8 +47,7 @@  discard block
 block discarded – undo
47 47
 					? $backtrace[$offset+2]['class']
48 48
 					: null;
49 49
 			$function = $backtrace[$offset+2]['function'];
50
-		}
51
-		else
50
+		} else
52 51
 		{
53 52
 			$class = null;
54 53
 			$function = null;
@@ -59,8 +58,7 @@  discard block
 block discarded – undo
59 58
 			$method = $function;
60 59
 			$class_method = $class . '::' . $function;
61 60
 			$function = null;
62
-		}
63
-		else
61
+		} else
64 62
 		{
65 63
 			$method = null;
66 64
 			$class_method = null;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/3.x/Patcher/FunctionPatcher.php 2 patches
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.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,8 +72,7 @@  discard block
 block discarded – undo
72 72
 			if (is_string($token))
73 73
 			{
74 74
 				$new_source .= $token;
75
-			}
76
-			elseif (isset($replacement['key']) && $i == $replacement['key'])
75
+			} elseif (isset($replacement['key']) && $i == $replacement['key'])
77 76
 			{
78 77
 				$new_source .= $replacement['value'];
79 78
 				$replacement['key'] = key(self::$replacement);
@@ -83,8 +82,7 @@  discard block
 block discarded – undo
83 82
 				{
84 83
 					$replacement = false;
85 84
 				}
86
-			}
87
-			else
85
+			} else
88 86
 			{
89 87
 				$new_source .= $token[1];
90 88
 			}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/3.x/Patcher/ConstantPatcher.php 2 patches
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.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,8 +72,7 @@  discard block
 block discarded – undo
72 72
 			if (is_string($token))
73 73
 			{
74 74
 				$new_source .= $token;
75
-			}
76
-			elseif (isset($replacement['key']) && $i == $replacement['key'])
75
+			} elseif (isset($replacement['key']) && $i == $replacement['key'])
77 76
 			{
78 77
 				$new_source .= $replacement['value'];
79 78
 				$replacement['key'] = key(self::$replacement);
@@ -83,8 +82,7 @@  discard block
 block discarded – undo
83 82
 				{
84 83
 					$replacement = false;
85 84
 				}
86
-			}
87
-			else
85
+			} else
88 86
 			{
89 87
 				$new_source .= $token[1];
90 88
 			}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/3.x/MonkeyPatchManager.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,8 +70,7 @@
 block discarded – undo
70 70
 		if (isset($config['root_dir']))
71 71
 		{
72 72
 			Cache::setProjectRootDir($config['root_dir']);
73
-		}
74
-		else
73
+		} else
75 74
 		{
76 75
 			// APPPATH is constant in CodeIgniter
77 76
 			Cache::setProjectRootDir(APPPATH . '../');
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
 	public static function log($message)
43 43
 	{
44
-		if (! self::$debug)
44
+		if ( ! self::$debug)
45 45
 		{
46 46
 			return;
47 47
 		}
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 		}
81 81
 		if (is_null(self::$log_file))
82 82
 		{
83
-			self::$log_file = __DIR__ . '/debug.log';
83
+			self::$log_file = __DIR__.'/debug.log';
84 84
 		}
85 85
 	}
86 86
 
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
93 93
 		else
94 94
 		{
95 95
 			// APPPATH is constant in CodeIgniter
96
-			Cache::setProjectRootDir(APPPATH . '../');
96
+			Cache::setProjectRootDir(APPPATH.'../');
97 97
 		}
98 98
 
99
-		if (! isset($config['cache_dir']))
99
+		if ( ! isset($config['cache_dir']))
100 100
 		{
101 101
 			throw new LogicException('You have to set "cache_dir"');
102 102
 		}
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 
106 106
 	protected static function setPaths(array $config)
107 107
 	{
108
-		if (! isset($config['include_paths']))
108
+		if ( ! isset($config['include_paths']))
109 109
 		{
110 110
 			throw new LogicException('You have to set "include_paths"');
111 111
 		}
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 		// Updated?
167 167
 		if ($cached !== $current)
168 168
 		{
169
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
169
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
170 170
 			Cache::clearSrcCache();
171 171
 			Cache::writeTmpIncludePaths($current);
172 172
 		}
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 		// Updated?
178 178
 		if ($cached !== $current)
179 179
 		{
180
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
180
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
181 181
 			Cache::clearSrcCache();
182 182
 			Cache::writeTmpExcludePaths($current);
183 183
 		}
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 		// Updated?
191 191
 		if ($cached !== self::$patcher_list)
192 192
 		{
193
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
193
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
194 194
 			Cache::clearSrcCache();
195 195
 			Cache::writeTmpPatcherList(self::$patcher_list);
196 196
 		}
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 		// Updated?
205 205
 		if ($cached !== $current)
206 206
 		{
207
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
207
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
208 208
 			Cache::clearSrcCache();
209 209
 			Cache::writeTmpFunctionWhitelist($current);
210 210
 		}
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 	 */
267 267
 	public static function patch($path)
268 268
 	{
269
-		if (! is_readable($path))
269
+		if ( ! is_readable($path))
270 270
 		{
271 271
 			throw new LogicException("Can't read '$path'");
272 272
 		}
@@ -274,17 +274,17 @@  discard block
 block discarded – undo
274 274
 		// Check cache file
275 275
 		if ($cache_file = Cache::getValidSrcCachePath($path))
276 276
 		{
277
-			self::log('cache_hit: ' . $path);
277
+			self::log('cache_hit: '.$path);
278 278
 			return fopen($cache_file, 'r');
279 279
 		}
280 280
 
281
-		self::log('cache_miss: ' . $path);
281
+		self::log('cache_miss: '.$path);
282 282
 		$source = file_get_contents($path);
283 283
 
284 284
 		list($new_source, $patched) = self::execPatchers($source);
285 285
 
286 286
 		// Write to cache file
287
-		self::log('write_cache: ' . $path);
287
+		self::log('write_cache: '.$path);
288 288
 		Cache::writeSrcCacheFile($path, $new_source);
289 289
 
290 290
 		$resource = fopen('php://memory', 'rb+');
@@ -300,12 +300,12 @@  discard block
 block discarded – undo
300 300
 			return;
301 301
 		}
302 302
 
303
-		require __DIR__ . '/Patcher/AbstractPatcher.php';
304
-		require __DIR__ . '/Patcher/Backtrace.php';
303
+		require __DIR__.'/Patcher/AbstractPatcher.php';
304
+		require __DIR__.'/Patcher/Backtrace.php';
305 305
 
306 306
 		foreach (self::$patcher_list as $classname)
307 307
 		{
308
-			require __DIR__ . '/Patcher/' . $classname . '.php';
308
+			require __DIR__.'/Patcher/'.$classname.'.php';
309 309
 		}
310 310
 
311 311
 		self::$load_patchers = true;
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 		$patched = false;
317 317
 		foreach (self::$patcher_list as $classname)
318 318
 		{
319
-			$classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname;
319
+			$classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname;
320 320
 			$patcher = new $classname;
321 321
 			list($source, $patched_this) = $patcher->patch($source);
322 322
 			$patched = $patched || $patched_this;
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/2.x/Patcher/FunctionPatcher/Proxy.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 			self::outputMessage($msg);
52 52
 			throw new LogicException($msg);
53 53
 		}
54
-		if (! FunctionPatcher::isWhitelisted($function))
54
+		if ( ! FunctionPatcher::isWhitelisted($function))
55 55
 		{
56 56
 			$msg = "<red>Can't patch on '$function'. It is not in whitelist. If you want to patch it, please add it to 'functions_to_patch' in 'tests/Bootstrap.php'. But note that there are some limitations. See <https://github.com/kenjis/ci-phpunit-test/blob/master/docs/HowToWriteTests.md#patching-functions> for details.</red>";
57 57
 			self::outputMessage($msg);
@@ -97,16 +97,16 @@  discard block
 block discarded – undo
97 97
 			$line = $info['line'];
98 98
 			$method = isset($info['class_method']) ? $info['class_method'] : $info['function'];
99 99
 
100
-			$log_args = function () use ($arguments) {
100
+			$log_args = function() use ($arguments) {
101 101
 				$output = '';
102 102
 				foreach ($arguments as $arg) {
103
-					$output .= var_export($arg, true) . ', ';
103
+					$output .= var_export($arg, true).', ';
104 104
 				}
105 105
 				$output = rtrim($output, ', ');
106 106
 				return $output;
107 107
 			};
108 108
 			MonkeyPatchManager::log(
109
-				'invoke_func: ' . $function . '(' . $log_args() . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()'
109
+				'invoke_func: '.$function.'('.$log_args().') on line '.$line.' in '.$file.' by '.$method.'()'
110 110
 			);
111 111
 		}
112 112
 	}
@@ -148,10 +148,10 @@  discard block
 block discarded – undo
148 148
 
149 149
 		if (isset(self::$patches_to_apply[$function]))
150 150
 		{
151
-			if (! self::checkCalledMethod($function))
151
+			if ( ! self::checkCalledMethod($function))
152 152
 			{
153 153
 				MonkeyPatchManager::log(
154
-					'invoke_func: ' . $function . '() not patched (out of scope)'
154
+					'invoke_func: '.$function.'() not patched (out of scope)'
155 155
 				);
156 156
 				self::checkPassedByReference($function);
157 157
 				return call_user_func_array($function, $arguments);
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 
161 161
 		if (array_key_exists($function, self::$patches))
162 162
 		{
163
-			MonkeyPatchManager::log('invoke_func: ' . $function . '() patched');
163
+			MonkeyPatchManager::log('invoke_func: '.$function.'() patched');
164 164
 
165 165
 			if (is_callable(self::$patches[$function]))
166 166
 			{
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		}
179 179
 
180 180
 		MonkeyPatchManager::log(
181
-			'invoke_func: ' . $function . '() not patched (no patch)'
181
+			'invoke_func: '.$function.'() not patched (no patch)'
182 182
 		);
183 183
 		self::checkPassedByReference($function);
184 184
 		return call_user_func_array($function, $arguments);
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 		$msg = str_replace(
232 232
 			['<red>', '</red>'], [$red_begin, $red_end], $msg
233 233
 		);
234
-		echo $msg . "\n";
234
+		echo $msg."\n";
235 235
 	}
236 236
 
237 237
 	/**
Please login to merge, or discard this patch.