Completed
Pull Request — master (#161)
by Kenji
02:26
created
application/tests/_ci_phpunit_test/CIPHPUnitTestRequest.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -250,6 +250,9 @@
 block discarded – undo
250 250
 		return $this->createAndCallController($class, $method, $params);
251 251
 	}
252 252
 
253
+	/**
254
+	 * @param string $hook
255
+	 */
253 256
 	protected function callHook($hook)
254 257
 	{
255 258
 		if ($this->enableHooks)
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -129,8 +129,7 @@  discard block
 block discarded – undo
129 129
 				return $this->callControllerMethod(
130 130
 					$http_method, $argv, $params
131 131
 				);
132
-			}
133
-			else
132
+			} else
134 133
 			{
135 134
 				return $this->requestUri($http_method, $argv, $params);
136 135
 			}
@@ -141,8 +140,7 @@  discard block
 block discarded – undo
141 140
 			if ($e->getCode() === 0)
142 141
 			{
143 142
 				set_status_header(200);
144
-			}
145
-			else
143
+			} else
146 144
 			{
147 145
 				set_status_header($e->getCode());
148 146
 			}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/Cache.php 1 patch
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -63,6 +63,9 @@  discard block
 block discarded – undo
63 63
 		return self::$cache_dir;
64 64
 	}
65 65
 
66
+	/**
67
+	 * @param string $path
68
+	 */
66 69
 	public static function getSrcCacheFilePath($path)
67 70
 	{
68 71
 		$len = strlen(self::$project_root);
@@ -158,6 +161,9 @@  discard block
 block discarded – undo
158 161
 		);
159 162
 	}
160 163
 
164
+	/**
165
+	 * @param string $filename
166
+	 */
161 167
 	protected static function writeTmpConfFile($filename, array $list)
162 168
 	{
163 169
 		$contents = implode("\n", $list);
@@ -194,6 +200,9 @@  discard block
 block discarded – undo
194 200
 		);
195 201
 	}
196 202
 
203
+	/**
204
+	 * @param string $filename
205
+	 */
197 206
 	protected static function getTmpConfFile($filename)
198 207
 	{
199 208
 		if (is_readable(self::$$filename))
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/MonkeyPatch.php 2 patches
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	 * 
22 22
 	 * @param string $function     function name
23 23
 	 * @param mixed  $return_value return value
24
-	 * @param string $class_name   class::method to apply this patch
24
+	 * @param string $class_method   class::method to apply this patch
25 25
 	 */
26 26
 	public static function patchFunction($function, $return_value, $class_method = null)
27 27
 	{
@@ -55,6 +55,9 @@  discard block
 block discarded – undo
55 55
 		PatchManager::clear();
56 56
 	}
57 57
 
58
+	/**
59
+	 * @param string $class_method
60
+	 */
58 61
 	protected static function getClassname($class_method)
59 62
 	{
60 63
 		if (strpos($class_method, '::') === false)
Please login to merge, or discard this 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.
application/tests/_ci_phpunit_test/patcher/MonkeyPatchManager.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -32,6 +32,9 @@  discard block
 block discarded – undo
32 32
 		'MethodPatcher',
33 33
 	];
34 34
 
35
+	/**
36
+	 * @param string $message
37
+	 */
35 38
 	public static function log($message)
36 39
 	{
37 40
 		if (! self::$debug)
@@ -276,6 +279,9 @@  discard block
 block discarded – undo
276 279
 		self::$load_patchers = true;
277 280
 	}
278 281
 
282
+	/**
283
+	 * @param string $source
284
+	 */
279 285
 	protected static function execPatchers($source)
280 286
 	{
281 287
 		$patched = false;
Please login to merge, or discard this 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/Patcher/FunctionPatcher/Proxy.php 1 patch
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.
application/tests/_ci_phpunit_test/replacing/core/Common.php 2 patches
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -136,6 +136,11 @@  discard block
 block discarded – undo
136 136
 	return $_is_loaded;
137 137
 }
138 138
 
139
+/**
140
+ * @param boolean $return
141
+ *
142
+ * @return boolean
143
+ */
139 144
 function is_cli($return = null)
140 145
 {
141 146
 	static $_return = TRUE;
@@ -148,6 +153,9 @@  discard block
 block discarded – undo
148 153
 	return $_return;
149 154
 }
150 155
 
156
+/**
157
+ * @param string $message
158
+ */
151 159
 function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered')
152 160
 {
153 161
 	$status_code = abs($status_code);
Please login to merge, or discard this patch.
Braces   +9 added lines, -10 removed lines patch added patch discarded remove patch
@@ -158,14 +158,16 @@  discard block
 block discarded – undo
158 158
 	if ($status_code < 100)
159 159
 	{
160 160
 		$exit_status = $status_code + 9; // 9 is EXIT__AUTO_MIN
161
-		if ($exit_status > 125) // 125 is EXIT__AUTO_MAX
161
+		if ($exit_status > 125) {
162
+			// 125 is EXIT__AUTO_MAX
162 163
 		{
163
-			$exit_status = 1; // EXIT_ERROR
164
+			$exit_status = 1;
165
+		}
166
+		// EXIT_ERROR
164 167
 		}
165 168
 
166 169
 		$status_code = 500;
167
-	}
168
-	else
170
+	} else
169 171
 	{
170 172
 		$exit_status = 1; // EXIT_ERROR
171 173
 	}
@@ -254,8 +256,7 @@  discard block
 block discarded – undo
254 256
 		if (isset($stati[$code]))
255 257
 		{
256 258
 			$text = $stati[$code];
257
-		}
258
-		else
259
+		} else
259 260
 		{
260 261
 			show_error('No status text available. Please check your status code number or supply your own message text.', 500);
261 262
 		}
@@ -281,8 +282,7 @@  discard block
 block discarded – undo
281 282
 	if (strpos(PHP_SAPI, 'cgi') === 0)
282 283
 	{
283 284
 		header('Status: '.$code.' '.$text, TRUE);
284
-	}
285
-	else
285
+	} else
286 286
 	{
287 287
 		$server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
288 288
 		header($server_protocol.' '.$code.' '.$text, TRUE, $code);
@@ -325,8 +325,7 @@  discard block
 block discarded – undo
325 325
 		if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php'))
326 326
 		{
327 327
 			require($file_path);
328
-		}
329
-		elseif ( ! $found)
328
+		} elseif ( ! $found)
330 329
 		{
331 330
 			set_status_header(503);
332 331
 			echo 'The configuration file does not exist.';
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestAutoloader.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -43,8 +43,7 @@  discard block
 block discarded – undo
43 43
 				APPPATH.'controllers',
44 44
 				APPPATH.'modules',
45 45
 			];
46
-		}
47
-		else
46
+		} else
48 47
 		{
49 48
 			$this->dirs = $dirs;
50 49
 		}
@@ -85,8 +84,7 @@  discard block
 block discarded – undo
85 84
 		{
86 85
 			$dir = __DIR__;
87 86
 			$this->loadClassFile($dir, $class);
88
-		}
89
-		else
87
+		} else
90 88
 		{
91 89
 			$dir = __DIR__ . '/exceptions';
92 90
 			$this->loadClassFile($dir, $class);
@@ -151,8 +149,7 @@  discard block
 block discarded – undo
151 149
 			{
152 150
 				require $filename;
153 151
 				return true;
154
-			}
155
-			else
152
+			} else
156 153
 			{
157 154
 				unset($this->cache[$class]);
158 155
 			}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestRouter.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -29,16 +29,14 @@
 block discarded – undo
29 29
 		if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
30 30
 		{
31 31
 			$e404 = TRUE;
32
-		}
33
-		else
32
+		} else
34 33
 		{
35 34
 			require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
36 35
 
37 36
 			if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
38 37
 			{
39 38
 				$e404 = TRUE;
40
-			}
41
-			elseif (method_exists($class, '_remap'))
39
+			} elseif (method_exists($class, '_remap'))
42 40
 			{
43 41
 				$params = array($method, array_slice($URI->rsegments, 2));
44 42
 				$method = '_remap';
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/InvocationVerifier.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -31,12 +31,10 @@  discard block
 block discarded – undo
31 31
 				if ($invoked === false)
32 32
 				{
33 33
 					$actual_times = 0;
34
-				}
35
-				elseif ($expected_params === null)
34
+				} elseif ($expected_params === null)
36 35
 				{
37 36
 					$actual_times = count($invocations[$class_method]);
38
-				}
39
-				else
37
+				} else
40 38
 				{
41 39
 					$count = 0;
42 40
 					foreach ($invocations[$class_method] as $actual_params)
@@ -56,16 +54,14 @@  discard block
 block discarded – undo
56 54
 						$actual_times,
57 55
 						$class_method . '() expected to be not invoked, but invoked ' . $actual_times . ' times.'
58 56
 					);
59
-				}
60
-				elseif ($expected_times === '+')
57
+				} elseif ($expected_times === '+')
61 58
 				{
62 59
 					PHPUnit_Framework_TestCase::assertGreaterThanOrEqual(
63 60
 						1,
64 61
 						$actual_times,
65 62
 						$class_method . '() expected to be invoked at least one time, but invoked ' . $actual_times . ' times.'
66 63
 					);
67
-				}
68
-				else
64
+				} else
69 65
 				{
70 66
 					PHPUnit_Framework_TestCase::assertEquals(
71 67
 						$expected_times,
Please login to merge, or discard this patch.