Completed
Pull Request — master (#161)
by Kenji
02:26
created
application/tests/_ci_phpunit_test/CIPHPUnitTestRequest.php 1 patch
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.
application/tests/_ci_phpunit_test/patcher/Cache.php 2 patches
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.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -251,10 +251,10 @@
 block discarded – undo
251 251
 	}
252 252
 
253 253
 	/**
254
-	* Recursive Unlink
255
-	*
256
-	* @param string $dir
257
-	*/
254
+	 * Recursive Unlink
255
+	 *
256
+	 * @param string $dir
257
+	 */
258 258
 	protected static function recursiveUnlink($dir)
259 259
 	{
260 260
 		if (! is_dir($dir))
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.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -37,12 +37,12 @@
 block discarded – undo
37 37
 	}
38 38
 
39 39
 	/**
40
-     * Patch on constant
41
-     * 
42
-     * @param type $constant
43
-     * @param type $value
44
-     * @param type $class_method
45
-     */
40
+	 * Patch on constant
41
+	 * 
42
+	 * @param type $constant
43
+	 * @param type $value
44
+	 * @param type $class_method
45
+	 */
46 46
 	public static function patchConstant($constant, $value, $class_method = null)
47 47
 	{
48 48
 		ConstProxy::patch($constant, $value, $class_method);
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/MonkeyPatchManager.php 1 patch
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.
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 1 patch
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.
application/tests/_ci_phpunit_test/replacing/core/Input.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 	/**
234 234
 	 * Fetch an item from the GET array
235 235
 	 *
236
-	 * @param	mixed	$index		Index for item to be fetched from $_GET
236
+	 * @param	string	$index		Index for item to be fetched from $_GET
237 237
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
238 238
 	 * @return	mixed
239 239
 	 */
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 	/**
248 248
 	 * Fetch an item from the POST array
249 249
 	 *
250
-	 * @param	mixed	$index		Index for item to be fetched from $_POST
250
+	 * @param	string	$index		Index for item to be fetched from $_POST
251 251
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
252 252
 	 * @return	mixed
253 253
 	 */
@@ -307,9 +307,9 @@  discard block
 block discarded – undo
307 307
 	/**
308 308
 	 * Fetch an item from the SERVER array
309 309
 	 *
310
-	 * @param	mixed	$index		Index for item to be fetched from $_SERVER
310
+	 * @param	string	$index		Index for item to be fetched from $_SERVER
311 311
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
312
-	 * @return	mixed
312
+	 * @return	string
313 313
 	 */
314 314
 	public function server($index, $xss_clean = NULL)
315 315
 	{
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
892 892
 	 * Allows read access to protected properties
893 893
 	 *
894 894
 	 * @param	string	$name
895
-	 * @return	mixed
895
+	 * @return	string|null
896 896
 	 */
897 897
 	public function __get($name)
898 898
 	{
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/TestSuiteProvider.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -52,71 +52,71 @@
 block discarded – undo
52 52
  */
53 53
 final class TestSuiteProvider
54 54
 {
55
-    /**
56
-     * phpunit configuration file
57
-     *
58
-     * @var string
59
-     */
60
-    private static $file;
55
+	/**
56
+	 * phpunit configuration file
57
+	 *
58
+	 * @var string
59
+	 */
60
+	private static $file;
61 61
 
62
-    /**
63
-     * constructor
64
-     */
65
-    private function __construct() {}
62
+	/**
63
+	 * constructor
64
+	 */
65
+	private function __construct() {}
66 66
 
67
-    /**
68
-     * set the phpunit configuration file
69
-     *
70
-     * @param string $file the path or filename of the phunit configuration file
71
-     */
72
-    public static function setConfigurationFile($file)
73
-    {
74
-        static::$file = $file;
75
-    }
67
+	/**
68
+	 * set the phpunit configuration file
69
+	 *
70
+	 * @param string $file the path or filename of the phunit configuration file
71
+	 */
72
+	public static function setConfigurationFile($file)
73
+	{
74
+		static::$file = $file;
75
+	}
76 76
 
77
-    /**
78
-     * get the phpunit test suite instance
79
-     *
80
-     * @return PHPUnit_Framework_TestSuite returns the phpunit test suite instance
81
-     * @throws FileNotFoundException       if the file is not found
82
-     */
83
-    public static function suite()
84
-    {
85
-        $file = static::checkConfigurationFile(
86
-            static::getConfigurationFile()
87
-        );
77
+	/**
78
+	 * get the phpunit test suite instance
79
+	 *
80
+	 * @return PHPUnit_Framework_TestSuite returns the phpunit test suite instance
81
+	 * @throws FileNotFoundException       if the file is not found
82
+	 */
83
+	public static function suite()
84
+	{
85
+		$file = static::checkConfigurationFile(
86
+			static::getConfigurationFile()
87
+		);
88 88
 
89
-        return PHPUnit_Util_Configuration::getInstance($file)
90
-            ->getTestSuiteConfiguration();
91
-    }
89
+		return PHPUnit_Util_Configuration::getInstance($file)
90
+			->getTestSuiteConfiguration();
91
+	}
92 92
 
93
-    /**
94
-     * get the phpunit configuration file
95
-     *
96
-     * @return string
97
-     */
98
-    private static function getConfigurationFile()
99
-    {
100
-        static::$file = isset(static::$file)
101
-            ? static::$file
102
-            : APPPATH.'tests/phpunit.xml';
93
+	/**
94
+	 * get the phpunit configuration file
95
+	 *
96
+	 * @return string
97
+	 */
98
+	private static function getConfigurationFile()
99
+	{
100
+		static::$file = isset(static::$file)
101
+			? static::$file
102
+			: APPPATH.'tests/phpunit.xml';
103 103
 
104
-        return static::$file;
105
-    }
104
+		return static::$file;
105
+	}
106 106
 
107
-    /**
108
-     * check the given file
109
-     *
110
-     * @param  string                $file file to check
111
-     * @return string                returns the file if it is valid
112
-     * @throws FileNotFoundException if the file is not found
113
-     */
114
-    private static function checkConfigurationFile($file)
115
-    {
116
-        if (!file_exists($file)) {
117
-            throw new \RuntimeException("The requested phpunit configuration was not found at $file");
118
-        }
107
+	/**
108
+	 * check the given file
109
+	 *
110
+	 * @param  string                $file file to check
111
+	 * @return string                returns the file if it is valid
112
+	 * @throws FileNotFoundException if the file is not found
113
+	 */
114
+	private static function checkConfigurationFile($file)
115
+	{
116
+		if (!file_exists($file)) {
117
+			throw new \RuntimeException("The requested phpunit configuration was not found at $file");
118
+		}
119 119
 
120
-        return $file;
121
-    }
120
+		return $file;
121
+	}
122 122
 }
Please login to merge, or discard this patch.
update.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
 $app = 'application';
14 14
 if ($argv && $argv[1] && is_dir($argv[1])) {
15
-    $app = $argv[1];
15
+	$app = $argv[1];
16 16
 }
17 17
 $installer = new Installer();
18 18
 $installer->update($app);
Please login to merge, or discard this patch.