Completed
Pull Request — master (#5771)
by Florian
12:04
created
control/PjaxResponseNegotiator.php 1 patch
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,9 +35,9 @@  discard block
 block discarded – undo
35 35
 	protected $fragmentOverride = null;
36 36
 
37 37
 	/**
38
-	 * @param RequestHandler $controller
39 38
 	 * @param SS_HTTPResponse An existing response to reuse (optional)
40 39
 	 * @param Array $callbacks
40
+	 * @param SS_HTTPResponse $response
41 41
 	 */
42 42
 	public function __construct($callbacks = array(), $response = null) {
43 43
 		$this->callbacks = $callbacks;
@@ -61,7 +61,6 @@  discard block
 block discarded – undo
61 61
 	 * @param array $extraCallbacks List of anonymous functions or callables returning either a string
62 62
 	 * or SS_HTTPResponse, keyed by their fragment identifier. The 'default' key can
63 63
 	 * be used as a fallback for non-ajax responses.
64
-	 * @param array $fragmentOverride Change the response fragments.
65 64
 	 * @return SS_HTTPResponse
66 65
 	 */
67 66
 	public function respond(SS_HTTPRequest $request, $extraCallbacks = array()) {
@@ -109,7 +108,7 @@  discard block
 block discarded – undo
109 108
 	/**
110 109
 	 * Set up fragment overriding - will completely replace the incoming fragments.
111 110
 	 *
112
-	 * @param array $fragments Fragments to insert.
111
+	 * @param string[] $fragments Fragments to insert.
113 112
 	 */
114 113
 	public function setFragmentOverride($fragments) {
115 114
 		if (!is_array($fragments)) throw new InvalidArgumentException();
Please login to merge, or discard this patch.
control/Session.php 1 patch
Doc Comments   +6 added lines, -1 removed lines patch added patch discarded remove patch
@@ -273,7 +273,6 @@  discard block
 block discarded – undo
273 273
 	 *
274 274
 	 * @deprecated 4.0 Use the "Session.timeout_ips" config setting instead
275 275
 	 *
276
-	 * @param array $session_ips Array of IPv4 rules.
277 276
 	 */
278 277
 	public static function set_timeout_ips($ips) {
279 278
 		Deprecation::notice('4.0', 'Use the "Session.timeout_ips" config setting instead');
@@ -410,6 +409,9 @@  discard block
 block discarded – undo
410 409
 		}
411 410
 	}
412 411
 
412
+	/**
413
+	 * @param string $name
414
+	 */
413 415
 	public function inst_set($name, $val) {
414 416
 		// Quicker execution path for "."-free names
415 417
 		if(strpos($name, '.') === false) {
@@ -458,6 +460,9 @@  discard block
 block discarded – undo
458 460
 		$diffVar[sizeof($var)-1] = $val;
459 461
 	}
460 462
 
463
+	/**
464
+	 * @param string $name
465
+	 */
461 466
 	public function inst_get($name) {
462 467
 		// Quicker execution path for "."-free names
463 468
 		if(strpos($name, '.') === false) {
Please login to merge, or discard this patch.
core/ArrayLib.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@
 block discarded – undo
168 168
 	 *
169 169
 	 * Actually only one array argument is supported.
170 170
 	 *
171
-	 * @param $f callback to apply
171
+	 * @param string $f callback to apply
172 172
 	 * @param $array array
173 173
 	 * @return array
174 174
 	 */
Please login to merge, or discard this patch.
core/Diff.php 1 patch
Doc Comments   +10 added lines, -1 removed lines patch added patch discarded remove patch
@@ -247,6 +247,10 @@  discard block
 block discarded – undo
247 247
 	 * match.  The caller must trim matching lines from the beginning and end
248 248
 	 * of the portions it is going to specify.
249 249
 	 */
250
+
251
+	/**
252
+	 * @param double $nchunks
253
+	 */
250 254
 	public function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) {
251 255
 	$flip = false;
252 256
 
@@ -357,6 +361,11 @@  discard block
 block discarded – undo
357 361
 	 * Note that XLIM, YLIM are exclusive bounds.
358 362
 	 * All line numbers are origin-0 and discarded lines are not counted.
359 363
 	 */
364
+
365
+	/**
366
+	 * @param integer $xoff
367
+	 * @param integer $yoff
368
+	 */
360 369
 	public function _compareseq ($xoff, $xlim, $yoff, $ylim) {
361 370
 	// Slide down the bottom initial diagonal.
362 371
 	while ($xoff < $xlim && $yoff < $ylim
@@ -554,7 +563,7 @@  discard block
 block discarded – undo
554 563
 	 *
555 564
 	 *  $diff = new Diff($lines1, $lines2);
556 565
 	 *  $rev = $diff->reverse();
557
-	 * @return object A Diff object representing the inverse of the
566
+	 * @return Diff A Diff object representing the inverse of the
558 567
 	 *                original diff.
559 568
 	 */
560 569
 	public function reverse () {
Please login to merge, or discard this patch.
core/manifest/ConfigManifest.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -244,6 +244,9 @@  discard block
 block discarded – undo
244 244
 	 * splt/complete before and after matchers)
245 245
 	 *
246 246
 	 * Public so that ManifestFileFinder can call it. Not for general use.
247
+	 * @param string $basename
248
+	 * @param string $pathname
249
+	 * @param boolean $depth
247 250
 	 */
248 251
 	public function addYAMLConfigFile($basename, $pathname, $depth) {
249 252
 		if (!preg_match('{/([^/]+)/_config/}', $pathname, $match)) return;
@@ -467,7 +470,7 @@  discard block
 block discarded – undo
467 470
 	 * Returns false if the prefilterable parts of the rule aren't met, and true if they are
468 471
 	 *
469 472
 	 * @param  $rules array - A hash of rules as allowed in the only or except portion of a config fragment header
470
-	 * @return bool - True if the rules are met, false if not. (Note that depending on whether we were passed an
473
+	 * @return boolean|string - True if the rules are met, false if not. (Note that depending on whether we were passed an
471 474
 	 *                only or an except rule,
472 475
 	 * which values means accept or reject a fragment
473 476
 	 */
Please login to merge, or discard this patch.
core/manifest/ManifestCache.php 1 patch
Doc Comments   +12 added lines patch added patch discarded remove patch
@@ -7,9 +7,21 @@
 block discarded – undo
7 7
  * @subpackage manifest
8 8
  */
9 9
 interface ManifestCache {
10
+
11
+	/**
12
+	 * @return void
13
+	 */
10 14
 	public function __construct($name);
11 15
 	public function load($key);
16
+
17
+	/**
18
+	 * @return void
19
+	 */
12 20
 	public function save($data, $key);
21
+
22
+	/**
23
+	 * @return void
24
+	 */
13 25
 	public function clear();
14 26
 }
15 27
 
Please login to merge, or discard this patch.
core/startup/ParameterConfirmationToken.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@  discard block
 block discarded – undo
36 36
 	 */
37 37
 	protected $token = null;
38 38
 
39
+	/**
40
+	 * @param string $token
41
+	 */
39 42
 	protected function pathForToken($token) {
40 43
 		return TEMP_FOLDER.'/token_'.preg_replace('/[^a-z0-9]+/', '', $token);
41 44
 	}
@@ -235,7 +238,7 @@  discard block
 block discarded – undo
235 238
 	 * Given a list of token names, suppress all tokens that have not been validated, and
236 239
 	 * return the non-validated token with the highest priority
237 240
 	 *
238
-	 * @param array $keys List of token keys in ascending priority (low to high)
241
+	 * @param string[] $keys List of token keys in ascending priority (low to high)
239 242
 	 * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority
240 243
 	 */
241 244
 	public static function prepare_tokens($keys) {
Please login to merge, or discard this patch.
core/TempPath.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
  * @package framework
6 6
  * @subpackage core
7 7
  *
8
- * @param $base The base path to use for determining the temporary path
8
+ * @param string $base The base path to use for determining the temporary path
9 9
  * @return string Path to temp
10 10
  */
11 11
 function getTempFolder($base = null) {
Please login to merge, or discard this patch.
dev/Backtrace.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 *
115 115
 	 * @param unknown_type $returnVal
116 116
 	 * @param unknown_type $ignoreAjax
117
-	 * @return unknown
117
+	 * @return string|null
118 118
 	 */
119 119
 	public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) {
120 120
 		$plainText = Director::is_cli() || (Director::is_ajax() && !$ignoreAjax);
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	 * shown
132 132
 	 *
133 133
 	 * @param Object $item
134
-	 * @param boolean $showArg
134
+	 * @param boolean $showArgs
135 135
 	 * @param Int $argCharLimit
136 136
 	 * @return String
137 137
 	 */
Please login to merge, or discard this patch.