Completed
Pull Request — master (#106)
by Kenji
04:30 queued 01:50
created
application/tests/_ci_phpunit_test/patcher/MonkeyPatchManager.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 	public static function log($message)
36 36
 	{
37
-		if (! self::$debug)
37
+		if ( ! self::$debug)
38 38
 		{
39 39
 			return;
40 40
 		}
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 		}
65 65
 		if (self::$debug)
66 66
 		{
67
-			self::$log_file = __DIR__ . '/debug.log';
67
+			self::$log_file = __DIR__.'/debug.log';
68 68
 		}
69 69
 
70 70
 		if (isset($config['root_dir']))
@@ -74,16 +74,16 @@  discard block
 block discarded – undo
74 74
 		else
75 75
 		{
76 76
 			// APPPATH is constant in CodeIgniter
77
-			Cache::setProjectRootDir(APPPATH . '../');
77
+			Cache::setProjectRootDir(APPPATH.'../');
78 78
 		}
79 79
 
80
-		if (! isset($config['cache_dir']))
80
+		if ( ! isset($config['cache_dir']))
81 81
 		{
82 82
 			throw new LogicException('You have to set "cache_dir"');
83 83
 		}
84 84
 		self::setCacheDir($config['cache_dir']);
85 85
 
86
-		if (! isset($config['include_paths']))
86
+		if ( ! isset($config['include_paths']))
87 87
 		{
88 88
 			throw new LogicException('You have to set "include_paths"');
89 89
 		}
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		// Updated?
132 132
 		if ($cached !== $current)
133 133
 		{
134
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
134
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
135 135
 			Cache::clearSrcCache();
136 136
 			Cache::writeTmpIncludePaths($current);
137 137
 		}
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 		// Updated?
143 143
 		if ($cached !== $current)
144 144
 		{
145
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
145
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
146 146
 			Cache::clearSrcCache();
147 147
 			Cache::writeTmpExcludePaths($current);
148 148
 		}
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 		// Updated?
156 156
 		if ($cached !== self::$patcher_list)
157 157
 		{
158
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
158
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
159 159
 			Cache::clearSrcCache();
160 160
 			Cache::writeTmpPatcherList(self::$patcher_list);
161 161
 		}
@@ -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::writeTmpFunctionWhitelist($current);
175 175
 		}
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 	 */
232 232
 	public static function patch($path)
233 233
 	{
234
-		if (! is_readable($path))
234
+		if ( ! is_readable($path))
235 235
 		{
236 236
 			throw new LogicException("Can't read '$path'");
237 237
 		}
@@ -239,17 +239,17 @@  discard block
 block discarded – undo
239 239
 		// Check cache file
240 240
 		if ($cache_file = Cache::getValidSrcCachePath($path))
241 241
 		{
242
-			self::log('cache_hit: ' . $path);
242
+			self::log('cache_hit: '.$path);
243 243
 			return fopen($cache_file, 'r');
244 244
 		}
245 245
 
246
-		self::log('cache_miss: ' . $path);
246
+		self::log('cache_miss: '.$path);
247 247
 		$source = file_get_contents($path);
248 248
 
249 249
 		list($new_source, $patched) = self::execPatchers($source);
250 250
 
251 251
 		// Write to cache file
252
-		self::log('write_cache: ' . $path);
252
+		self::log('write_cache: '.$path);
253 253
 		Cache::writeSrcCacheFile($path, $new_source);
254 254
 
255 255
 		$resource = fopen('php://memory', 'rb+');
@@ -265,12 +265,12 @@  discard block
 block discarded – undo
265 265
 			return;
266 266
 		}
267 267
 
268
-		require __DIR__ . '/Patcher/AbstractPatcher.php';
269
-		require __DIR__ . '/Patcher/Backtrace.php';
268
+		require __DIR__.'/Patcher/AbstractPatcher.php';
269
+		require __DIR__.'/Patcher/Backtrace.php';
270 270
 
271 271
 		foreach (self::$patcher_list as $classname)
272 272
 		{
273
-			require __DIR__ . '/Patcher/' . $classname . '.php';
273
+			require __DIR__.'/Patcher/'.$classname.'.php';
274 274
 		}
275 275
 
276 276
 		self::$load_patchers = true;
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 		$patched = false;
282 282
 		foreach (self::$patcher_list as $classname)
283 283
 		{
284
-			$classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname;
284
+			$classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname;
285 285
 			$patcher = new $classname;
286 286
 			list($source, $patched_this) = $patcher->patch($source);
287 287
 			$patched = $patched || $patched_this;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/Patcher/Backtrace.php 1 patch
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.
application/tests/_ci_phpunit_test/patcher/Patcher/ExitPatcher.php 1 patch
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.
application/tests/_ci_phpunit_test/patcher/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.
tests/_ci_phpunit_test/patcher/Patcher/FunctionPatcher/NodeVisitor.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -36,17 +36,17 @@  discard block
 block discarded – undo
36 36
 {
37 37
 	public function leaveNode(Node $node)
38 38
 	{
39
-		if (! ($node instanceof FuncCall))
39
+		if ( ! ($node instanceof FuncCall))
40 40
 		{
41 41
 			return;
42 42
 		}
43 43
 
44
-		if (! ($node->name instanceof Name))
44
+		if ( ! ($node->name instanceof Name))
45 45
 		{
46 46
 			return;
47 47
 		}
48 48
 
49
-		if (! $node->name->isUnqualified())
49
+		if ( ! $node->name->isUnqualified())
50 50
 		{
51 51
 			return;
52 52
 		}
@@ -57,12 +57,12 @@  discard block
 block discarded – undo
57 57
 		) {
58 58
 			$replacement = new FullyQualified(array());
59 59
 			$replacement->set(
60
-				'\__FuncProxy__::' . (string) $node->name
60
+				'\__FuncProxy__::'.(string) $node->name
61 61
 			);
62 62
 
63 63
 			$pos = $node->getAttribute('startTokenPos');
64 64
 			FunctionPatcher::$replacement[$pos] = 
65
-				'\__FuncProxy__::' . (string) $node->name;
65
+				'\__FuncProxy__::'.(string) $node->name;
66 66
 
67 67
 			$node->name = $replacement;
68 68
 		}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/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.
application/tests/_ci_phpunit_test/patcher/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.
tests/_ci_phpunit_test/patcher/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/Patcher/MethodPatcher/PatchManager.php 1 patch
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.