Completed
Pull Request — master (#213)
by
unknown
08:25
created
tests/_ci_phpunit_test/patcher/3.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
 		}
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
55 55
 			FunctionPatcher::isWhitelisted((string) $node->name)
56 56
 			&& ! FunctionPatcher::isBlacklisted((string) $node->name)
57 57
 		) {
58
-			$replacement = new FullyQualified('\__FuncProxy__::' . (string) $node->name);
58
+			$replacement = new FullyQualified('\__FuncProxy__::'.(string) $node->name);
59 59
 
60 60
 			$pos = $node->getAttribute('startTokenPos');
61 61
 			FunctionPatcher::$replacement[$pos] = 
62
-				'\__FuncProxy__::' . (string) $node->name;
62
+				'\__FuncProxy__::'.(string) $node->name;
63 63
 
64 64
 			$node->name = $replacement;
65 65
 		}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/3.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/Patcher/MethodPatcher.php 3 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -13,8 +13,6 @@
 block discarded – undo
13 13
 require __DIR__ . '/MethodPatcher/NodeVisitor.php';
14 14
 require __DIR__ . '/MethodPatcher/PatchManager.php';
15 15
 
16
-use LogicException;
17
-
18 16
 use Kenjis\MonkeyPatch\Patcher\MethodPatcher\NodeVisitor;
19 17
 
20 18
 class MethodPatcher extends AbstractPatcher
Please login to merge, or discard this 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.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -58,13 +58,11 @@
 block discarded – undo
58 58
 					$new_source .= '{ ' . self::CODE;
59 59
 					$start_method = false;
60 60
 					$replacement = each(self::$replacement);
61
-				}
62
-				else
61
+				} else
63 62
 				{
64 63
 					$new_source .= $token;
65 64
 				}
66
-			}
67
-			else
65
+			} else
68 66
 			{
69 67
 				$new_source .= $token[1];
70 68
 			}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/3.x/Patcher/MethodPatcher/NodeVisitor.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,6 @@
 block discarded – undo
13 13
 use PhpParser\Node;
14 14
 use PhpParser\Node\Stmt\ClassMethod;
15 15
 use PhpParser\NodeVisitorAbstract;
16
-
17 16
 use Kenjis\MonkeyPatch\Patcher\MethodPatcher;
18 17
 
19 18
 class NodeVisitor extends NodeVisitorAbstract
Please login to merge, or discard this 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.
application/tests/_ci_phpunit_test/CIPHPUnitTest.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -85,8 +85,7 @@  discard block
 block discarded – undo
85 85
 		if (! self::wiredesignzHmvcInstalled())
86 86
 		{
87 87
 			new CI_Controller();
88
-		}
89
-		else
88
+		} else
90 89
 		{
91 90
 			new MX_Controller();
92 91
 		}
@@ -106,8 +105,7 @@  discard block
 block discarded – undo
106 105
 		if (! self::wiredesignzHmvcInstalled())
107 106
 		{
108 107
 			new CI_Controller();
109
-		}
110
-		else
108
+		} else
111 109
 		{
112 110
 			new CI();
113 111
 			new MX_Controller();
Please login to merge, or discard this 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 directory
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.
tests/_ci_phpunit_test/patcher/3.x/Patcher/ConstantPatcher/NodeVisitor.php 2 patches
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,23 +47,23 @@  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
-			$replacement = new FullyQualified('\__ConstProxy__::get(\'' . (string) $node->name . '\')');
62
+			$replacement = new FullyQualified('\__ConstProxy__::get(\''.(string) $node->name.'\')');
63 63
 
64 64
 			$pos = $node->getAttribute('startTokenPos');
65 65
 			ConstantPatcher::$replacement[$pos] = 
66
-				'\__ConstProxy__::get(\'' . (string) $node->name .'\')';
66
+				'\__ConstProxy__::get(\''.(string) $node->name.'\')';
67 67
 
68 68
 			$node->name = $replacement;
69 69
 		}
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 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.
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/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.