Completed
Pull Request — master (#299)
by
unknown
02:38
created
application/tests/_ci_phpunit_test/replacing/helpers/download_helper.php 2 patches
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -67,8 +67,7 @@  discard block
 block discarded – undo
67 67
 		if ($filename === '' OR $data === '')
68 68
 		{
69 69
 			return;
70
-		}
71
-		elseif ($data === NULL)
70
+		} elseif ($data === NULL)
72 71
 		{
73 72
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
74 73
 			{
@@ -78,8 +77,7 @@  discard block
 block discarded – undo
78 77
 			$filepath = $filename;
79 78
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
80 79
 			$filename = end($filename);
81
-		}
82
-		else
80
+		} else
83 81
 		{
84 82
 			$filesize = strlen($data);
85 83
 		}
@@ -158,8 +156,7 @@  discard block
 block discarded – undo
158 156
 			if (ENVIRONMENT !== 'testing')
159 157
 			{
160 158
 				exit($data);
161
-			}
162
-			else
159
+			} else
163 160
 			{
164 161
 				echo($data);
165 162
 				throw new CIPHPUnitTestExitException('exit() from force_download()');
@@ -176,8 +173,7 @@  discard block
 block discarded – undo
176 173
 		if (ENVIRONMENT !== 'testing')
177 174
 		{
178 175
 			exit;
179
-		}
180
-		else
176
+		} else
181 177
 		{
182 178
 			throw new CIPHPUnitTestExitException('exit() from force_download()');
183 179
 		}
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 			}
102 102
 
103 103
 			// Load the mime types
104
-			$mimes =& get_mimes();
104
+			$mimes = & get_mimes();
105 105
 
106 106
 			// Only change the default MIME if we can find one
107 107
 			if (isset($mimes[$extension]))
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 
147 147
 		if (ENVIRONMENT === 'testing')
148 148
 		{
149
-			$CI =& get_instance();
149
+			$CI = & get_instance();
150 150
 			$CI->output->set_header('Content-Type: '.$mime);
151 151
 			$CI->output->set_header('Content-Disposition: attachment; filename="'.$filename.'"');
152 152
 			$CI->output->set_header('Expires: 0');
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestSuperGlobal.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 		}
43 43
 
44 44
 		// Handle single file
45
-		$file =& $files[$field];
45
+		$file = & $files[$field];
46 46
 
47
-		if (! file_exists($file['tmp_name']))
47
+		if ( ! file_exists($file['tmp_name']))
48 48
 		{
49 49
 			$file['error'] = UPLOAD_ERR_NO_FILE;
50 50
 			$file['type'] = '';
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 				// Set $_GET if URI string has query string
111 111
 				parse_str($query_string, $_GET);
112 112
 				// Remove query string from URI string
113
-				$argv = substr($argv, 0, -strlen($query_string)-1);
113
+				$argv = substr($argv, 0, -strlen($query_string) - 1);
114 114
 			}
115 115
 		}
116 116
 
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
143 143
 		if ($_GET !== [])
144 144
 		{
145 145
 			$_SERVER['REQUEST_URI'] =
146
-				'/' . $path . '?'
146
+				'/'.$path.'?'
147 147
 				. http_build_query($_GET);
148 148
 		}
149 149
 		else
150 150
 		{
151
-			$_SERVER['REQUEST_URI'] = '/' . $path;
151
+			$_SERVER['REQUEST_URI'] = '/'.$path;
152 152
 		}
153 153
 	}
154 154
 
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 
166 166
 		if ($query_string === false)
167 167
 		{
168
-			throw new LogicException('Bad URI string: ' . $uri);
168
+			throw new LogicException('Bad URI string: '.$uri);
169 169
 		}
170 170
 
171 171
 		return $query_string;
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 		}
191 191
 		else
192 192
 		{
193
-			$key = 'HTTP_' . $normalized_name;
193
+			$key = 'HTTP_'.$normalized_name;
194 194
 		}
195 195
 
196 196
 		$_SERVER[$key] = $value;
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -76,8 +76,7 @@  discard block
 block discarded – undo
76 76
 		if (is_numeric($value))
77 77
 		{
78 78
 			return $value;
79
-		}
80
-		else
79
+		} else
81 80
 		{
82 81
 			$value_length = strlen($value);
83 82
 			$number = substr($value, 0, $value_length - 1);
@@ -133,8 +132,7 @@  discard block
 block discarded – undo
133 132
 		if (is_string($argv))
134 133
 		{
135 134
 			$path = $argv;
136
-		}
137
-		elseif (is_array($argv))
135
+		} elseif (is_array($argv))
138 136
 		{
139 137
 			// Generate URI path from array of controller, method, arg, ...
140 138
 			$path = implode('/', $argv);
@@ -145,8 +143,7 @@  discard block
 block discarded – undo
145 143
 			$_SERVER['REQUEST_URI'] =
146 144
 				'/' . $path . '?'
147 145
 				. http_build_query($_GET);
148
-		}
149
-		else
146
+		} else
150 147
 		{
151 148
 			$_SERVER['REQUEST_URI'] = '/' . $path;
152 149
 		}
@@ -187,8 +184,7 @@  discard block
 block discarded – undo
187 184
 		)
188 185
 		{
189 186
 			$key = $normalized_name;
190
-		}
191
-		else
187
+		} else
192 188
 		{
193 189
 			$key = 'HTTP_' . $normalized_name;
194 190
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/libraries/Upload.php 2 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -293,8 +293,8 @@  discard block
 block discarded – undo
293 293
 	{
294 294
 		empty($config) OR $this->initialize($config, FALSE);
295 295
 
296
-		$this->_mimes =& get_mimes();
297
-		$this->_CI =& get_instance();
296
+		$this->_mimes = & get_mimes();
297
+		$this->_CI = & get_instance();
298 298
 
299 299
 		log_message('info', 'Upload Class Initialized');
300 300
 	}
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 			else
481 481
 			{
482 482
 				// An extension was provided, let's have it!
483
-				$this->file_ext	= $this->get_extension($this->_file_name_override);
483
+				$this->file_ext = $this->get_extension($this->_file_name_override);
484 484
 			}
485 485
 
486 486
 			if ( ! $this->is_allowed_filetype(TRUE))
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
 		// Convert the file size to kilobytes
494 494
 		if ($this->file_size > 0)
495 495
 		{
496
-			$this->file_size = round($this->file_size/1024, 2);
496
+			$this->file_size = round($this->file_size / 1024, 2);
497 497
 		}
498 498
 
499 499
 		// Is the file size within the allowed maximum?
@@ -818,10 +818,10 @@  discard block
 block discarded – undo
818 818
 			{
819 819
 				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
820 820
 
821
-				$this->image_width	= $D[0];
822
-				$this->image_height	= $D[1];
823
-				$this->image_type	= isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
824
-				$this->image_size_str	= $D[3]; // string containing height and width
821
+				$this->image_width = $D[0];
822
+				$this->image_height = $D[1];
823
+				$this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
824
+				$this->image_size_str = $D[3]; // string containing height and width
825 825
 			}
826 826
 		}
827 827
 
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
 			$this->file_type = 'image/jpeg';
870 870
 		}
871 871
 
872
-		$img_mimes = array('image/gif',	'image/jpeg', 'image/png');
872
+		$img_mimes = array('image/gif', 'image/jpeg', 'image/png');
873 873
 
874 874
 		return in_array($this->file_type, $img_mimes, TRUE);
875 875
 	}
@@ -1011,7 +1011,7 @@  discard block
 block discarded – undo
1011 1011
 			return FALSE;
1012 1012
 		}
1013 1013
 
1014
-		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/',  $this->upload_path);
1014
+		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path);
1015 1015
 		return TRUE;
1016 1016
 	}
1017 1017
 
@@ -1055,9 +1055,9 @@  discard block
 block discarded – undo
1055 1055
 		$ext = '';
1056 1056
 		if (strpos($filename, '.') !== FALSE)
1057 1057
 		{
1058
-			$parts		= explode('.', $filename);
1059
-			$ext		= '.'.array_pop($parts);
1060
-			$filename	= implode('.', $parts);
1058
+			$parts = explode('.', $filename);
1059
+			$ext = '.'.array_pop($parts);
1060
+			$filename = implode('.', $parts);
1061 1061
 		}
1062 1062
 
1063 1063
 		return substr($filename, 0, ($length - strlen($ext))).$ext;
Please login to merge, or discard this patch.
Braces   +20 added lines, -17 removed lines patch added patch discarded remove patch
@@ -331,19 +331,16 @@  discard block
 block discarded – undo
331 331
 					if ($reflection->hasMethod('set_'.$key))
332 332
 					{
333 333
 						$this->{'set_'.$key}($config[$key]);
334
-					}
335
-					else
334
+					} else
336 335
 					{
337 336
 						$this->$key = $config[$key];
338 337
 					}
339
-				}
340
-				else
338
+				} else
341 339
 				{
342 340
 					$this->$key = $defaults[$key];
343 341
 				}
344 342
 			}
345
-		}
346
-		else
343
+		} else
347 344
 		{
348 345
 			foreach ($config as $key => &$value)
349 346
 			{
@@ -352,8 +349,7 @@  discard block
 block discarded – undo
352 349
 					if ($reflection->hasMethod('set_'.$key))
353 350
 					{
354 351
 						$this->{'set_'.$key}($value);
355
-					}
356
-					else
352
+					} else
357 353
 					{
358 354
 						$this->$key = $value;
359 355
 					}
@@ -415,9 +411,11 @@  discard block
 block discarded – undo
415 411
 		}
416 412
 
417 413
 		// Was the file able to be uploaded? If not, determine the reason why.
418
-		if ( ! file_exists($_file['tmp_name']))	// modified by ci-phpunit-test
414
+		if ( ! file_exists($_file['tmp_name'])) {
415
+			// modified by ci-phpunit-test
419 416
 		{
420 417
 			$error = isset($_file['error']) ? $_file['error'] : 4;
418
+		}
421 419
 
422 420
 			switch ($error)
423 421
 			{
@@ -482,8 +480,7 @@  discard block
 block discarded – undo
482 480
 			if (strpos($this->_file_name_override, '.') === FALSE)
483 481
 			{
484 482
 				$this->file_name .= $this->file_ext;
485
-			}
486
-			else
483
+			} else
487 484
 			{
488 485
 				// An extension was provided, let's have it!
489 486
 				$this->file_ext	= $this->get_extension($this->_file_name_override);
@@ -881,8 +878,7 @@  discard block
 block discarded – undo
881 878
 		if (in_array($this->file_type, $png_mimes))
882 879
 		{
883 880
 			$this->file_type = 'image/png';
884
-		}
885
-		elseif (in_array($this->file_type, $jpeg_mimes))
881
+		} elseif (in_array($this->file_type, $jpeg_mimes))
886 882
 		{
887 883
 			$this->file_type = 'image/jpeg';
888 884
 		}
@@ -1148,9 +1144,12 @@  discard block
 block discarded – undo
1148 1144
 
1149 1145
 		if (function_exists('getimagesize') && @getimagesize($file) !== FALSE)
1150 1146
 		{
1151
-			if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
1147
+			if (($file = @fopen($file, 'rb')) === FALSE) {
1148
+				// "b" to force binary
1152 1149
 			{
1153
-				return FALSE; // Couldn't open the file, return FALSE
1150
+				return FALSE;
1151
+			}
1152
+			// Couldn't open the file, return FALSE
1154 1153
 			}
1155 1154
 
1156 1155
 			$opening_bytes = fread($file, 256);
@@ -1269,9 +1268,11 @@  discard block
 block discarded – undo
1269 1268
 		if (function_exists('finfo_file'))
1270 1269
 		{
1271 1270
 			$finfo = @finfo_open(FILEINFO_MIME);
1272
-			if (is_resource($finfo)) // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
1271
+			if (is_resource($finfo)) {
1272
+				// It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
1273 1273
 			{
1274 1274
 				$mime = @finfo_file($finfo, $file['tmp_name']);
1275
+			}
1275 1276
 				finfo_close($finfo);
1276 1277
 
1277 1278
 				/* According to the comments section of the PHP manual page,
@@ -1356,10 +1357,12 @@  discard block
 block discarded – undo
1356 1357
 		if (function_exists('mime_content_type'))
1357 1358
 		{
1358 1359
 			$this->file_type = @mime_content_type($file['tmp_name']);
1359
-			if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string
1360
+			if (strlen($this->file_type) > 0) {
1361
+				// It's possible that mime_content_type() returns FALSE or an empty string
1360 1362
 			{
1361 1363
 				return;
1362 1364
 			}
1365
+			}
1363 1366
 		}
1364 1367
 
1365 1368
 		$this->file_type = $file['type'];
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/2.x/MonkeyPatchManager.php 4 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -35,6 +35,9 @@  discard block
 block discarded – undo
35 35
 		'ConstantPatcher',
36 36
 	];
37 37
 
38
+	/**
39
+	 * @param string $message
40
+	 */
38 41
 	public static function log($message)
39 42
 	{
40 43
 		if (! self::$debug)
@@ -303,6 +306,9 @@  discard block
 block discarded – undo
303 306
 		self::$load_patchers = true;
304 307
 	}
305 308
 
309
+	/**
310
+	 * @param string $source
311
+	 */
306 312
 	protected static function execPatchers($source)
307 313
 	{
308 314
 		$patched = false;
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,6 @@
 block discarded – undo
11 11
 namespace Kenjis\MonkeyPatch;
12 12
 
13 13
 use LogicException;
14
-use RuntimeException;
15 14
 use PhpParser\ParserFactory;
16 15
 use Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
17 16
 
Please login to merge, or discard this patch.
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/ConstantPatcher/NodeVisitor.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,6 @@
 block discarded – undo
15 15
 use PhpParser\Node\Name;
16 16
 use PhpParser\Node\Name\FullyQualified;
17 17
 use PhpParser\NodeVisitorAbstract;
18
-
19 18
 use Kenjis\MonkeyPatch\Patcher\ConstantPatcher;
20 19
 
21 20
 class NodeVisitor extends NodeVisitorAbstract
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function enterNode(Node $node)
26 26
 	{
27
-		$callback = [$this, 'before' . ucfirst($node->getType())];
27
+		$callback = [$this, 'before'.ucfirst($node->getType())];
28 28
 		if (is_callable($callback)) {
29 29
 			call_user_func_array($callback, [$node]);
30 30
 		}
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
 
33 33
 	public function leaveNode(Node $node)
34 34
 	{
35
-		if (! ($node instanceof ConstFetch))
35
+		if ( ! ($node instanceof ConstFetch))
36 36
 		{
37
-			$callback = [$this, 'rewrite' . ucfirst($node->getType())];
37
+			$callback = [$this, 'rewrite'.ucfirst($node->getType())];
38 38
 			if (is_callable($callback)) {
39 39
 				call_user_func_array($callback, [$node]);
40 40
 			}
@@ -47,26 +47,26 @@  discard block
 block discarded – undo
47 47
 			return;
48 48
 		}
49 49
 
50
-		if (! ($node->name instanceof Name))
50
+		if ( ! ($node->name instanceof Name))
51 51
 		{
52 52
 			return;
53 53
 		}
54 54
 
55
-		if (! $node->name->isUnqualified())
55
+		if ( ! $node->name->isUnqualified())
56 56
 		{
57 57
 			return;
58 58
 		}
59 59
 
60
-		if (! ConstantPatcher::isBlacklisted((string) $node->name))
60
+		if ( ! ConstantPatcher::isBlacklisted((string) $node->name))
61 61
 		{
62 62
 			$replacement = new FullyQualified(array());
63 63
 			$replacement->set(
64
-				'\__ConstProxy__::get(\'' . (string) $node->name . '\')'
64
+				'\__ConstProxy__::get(\''.(string) $node->name.'\')'
65 65
 			);
66 66
 
67 67
 			$pos = $node->getAttribute('startTokenPos');
68 68
 			ConstantPatcher::$replacement[$pos] = 
69
-				'\__ConstProxy__::get(\'' . (string) $node->name .'\')';
69
+				'\__ConstProxy__::get(\''.(string) $node->name.'\')';
70 70
 
71 71
 			$node->name = $replacement;
72 72
 		}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/2.x/Patcher/FunctionPatcher/NodeVisitor.php 2 patches
Unused Use Statements   -4 removed lines patch added patch discarded remove patch
@@ -21,15 +21,11 @@
 block discarded – undo
21 21
 
22 22
 namespace Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
23 23
 
24
-use ReflectionFunction;
25
-use ReflectionException;
26
-
27 24
 use PhpParser\Node;
28 25
 use PhpParser\Node\Expr\FuncCall;
29 26
 use PhpParser\Node\Name;
30 27
 use PhpParser\Node\Name\FullyQualified;
31 28
 use PhpParser\NodeVisitorAbstract;
32
-
33 29
 use Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
34 30
 
35 31
 class NodeVisitor extends NodeVisitorAbstract
Please login to merge, or discard this 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/2.x/Patcher/FunctionPatcher/Proxy.php 3 patches
Doc Comments   +10 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	 * 
38 38
 	 * @param string $function     function name
39 39
 	 * @param mixed  $return_value return value or callable
40
-	 * @param string $class_name   class::method to apply this patch
40
+	 * @param string $class_method   class::method to apply this patch
41 41
 	 * 
42 42
 	 * @throws LogicException
43 43
 	 */
@@ -86,6 +86,9 @@  discard block
 block discarded – undo
86 86
 		InvocationVerifier::verify(self::$expected_invocations, self::$invocations);
87 87
 	}
88 88
 
89
+	/**
90
+	 * @param string $function
91
+	 */
89 92
 	protected static function logInvocation($function, $arguments)
90 93
 	{
91 94
 		if (MonkeyPatchManager::$debug)
@@ -111,6 +114,9 @@  discard block
 block discarded – undo
111 114
 		}
112 115
 	}
113 116
 
117
+	/**
118
+	 * @param string $function
119
+	 */
114 120
 	protected static function checkCalledMethod($function)
115 121
 	{
116 122
 		$trace = debug_backtrace();
@@ -184,6 +190,9 @@  discard block
 block discarded – undo
184 190
 		return call_user_func_array($function, $arguments);
185 191
 	}
186 192
 
193
+	/**
194
+	 * @param string $function
195
+	 */
187 196
 	protected static function checkPassedByReference($function)
188 197
 	{
189 198
 		$ref_func = new ReflectionFunction($function);
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,6 @@
 block discarded – undo
15 15
 use LogicException;
16 16
 use ReflectionFunction;
17 17
 use ReflectionException;
18
-
19 18
 use Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
20 19
 use Kenjis\MonkeyPatch\Patcher\Backtrace;
21 20
 use Kenjis\MonkeyPatch\MonkeyPatchManager;
Please login to merge, or discard this 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/3.x/MonkeyPatchManager.php 4 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,6 @@
 block discarded – undo
11 11
 namespace Kenjis\MonkeyPatch;
12 12
 
13 13
 use LogicException;
14
-use RuntimeException;
15 14
 use PhpParser\ParserFactory;
16 15
 use Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
17 16
 
Please login to merge, or discard this patch.
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.
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -35,6 +35,9 @@  discard block
 block discarded – undo
35 35
 		'ConstantPatcher',
36 36
 	];
37 37
 
38
+	/**
39
+	 * @param string $message
40
+	 */
38 41
 	public static function log($message)
39 42
 	{
40 43
 		if (! self::$debug)
@@ -303,6 +306,9 @@  discard block
 block discarded – undo
303 306
 		self::$load_patchers = true;
304 307
 	}
305 308
 
309
+	/**
310
+	 * @param string $source
311
+	 */
306 312
 	protected static function execPatchers($source)
307 313
 	{
308 314
 		$patched = false;
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.
application/tests/_ci_phpunit_test/patcher/3.x/Patcher/Backtrace.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -20,6 +20,9 @@
 block discarded – undo
20 20
 		'ConstantPatcher' => 0,
21 21
 	];
22 22
 
23
+	/**
24
+	 * @param string $patcher
25
+	 */
23 26
 	public static function getInfo($patcher, $backtrace)
24 27
 	{
25 28
 		if (! isset(self::$map[$patcher]))
Please login to merge, or discard this 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.
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.