Completed
Pull Request — patch_1-1-4 (#3202)
by Spuds
15:49
created
sources/subs/EmailParse.class.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1163,7 +1163,7 @@
 block discarded – undo
1163 1163
 	 * - will look in various header fields where the ip may reside
1164 1164
 	 * - returns false if it can't find a valid IP4
1165 1165
 	 *
1166
-	 * @return string|boolean on fail
1166
+	 * @return string|false on fail
1167 1167
 	 */
1168 1168
 	public function load_ip()
1169 1169
 	{
Please login to merge, or discard this patch.
sources/Security.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -949,7 +949,7 @@
 block discarded – undo
949 949
  * @param string $action
950 950
  * @param bool   $is_fatal = true
951 951
  *
952
- * @return bool
952
+ * @return null|boolean
953 953
  * @throws Elk_Exception error_form_already_submitted
954 954
  */
955 955
 function checkSubmitOnce($action, $is_fatal = false)
Please login to merge, or discard this patch.
sources/Subs.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1801,11 +1801,11 @@
 block discarded – undo
1801 1801
 	}
1802 1802
 	else
1803 1803
 	{
1804
-		$pattern = '~^(' . implode('|', array_map(function ($val) {return preg_quote($val, '~');}, $protocols)) . ')~i';
1804
+		$pattern = '~^(' . implode('|', array_map(function ($val) {return preg_quote($val, '~'); }, $protocols)) . ')~i';
1805 1805
 	}
1806 1806
 
1807 1807
 	$found = false;
1808
-	$url = preg_replace_callback($pattern, function($match) use (&$found) {
1808
+	$url = preg_replace_callback($pattern, function ($match) use (&$found) {
1809 1809
 		$found = true;
1810 1810
 
1811 1811
 		return strtolower($match[0]);
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1589,7 +1589,7 @@
 block discarded – undo
1589 1589
  * @param resource $messages_request holds a query result
1590 1590
  * @param bool $reset
1591 1591
  *
1592
- * @return integer|boolean
1592
+ * @return integer|null
1593 1593
  */
1594 1594
 function currentContext($messages_request, $reset = false)
1595 1595
 {
Please login to merge, or discard this patch.
sources/subs/Mentioning.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	/**
177 177
 	 * Updating the status from the listing?
178 178
 	 *
179
-	 * @param int|int[] $items
179
+	 * @param integer $items
180 180
 	 * @param string $mark
181 181
 	 * @return bool if successfully changed or not
182 182
 	 */
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 	 * - when a user was already mentioned for a certain message (e.g. in case of editing)
283 283
 	 *
284 284
 	 * @package Mentions
285
-	 * @param int|int[] $id_mentions the mention id in the db
285
+	 * @param integer[] $id_mentions the mention id in the db
286 286
 	 * @param string $status status to update, 'new', 'read', 'deleted', 'unapproved'
287 287
 	 * @return bool if successfully changed or not
288 288
 	 */
Please login to merge, or discard this patch.
sources/modules/Drafts/DraftsPersonalMessageModule.class.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -196,7 +196,7 @@
 block discarded – undo
196 196
 	 * - Will load a draft if selected is supplied via post
197 197
 	 *
198 198
 	 * @param int $member_id
199
-	 * @param int|bool $id_pm = false if set, it will try to load drafts for this id
199
+	 * @param integer $id_pm = false if set, it will try to load drafts for this id
200 200
 	 *
201 201
 	 * @return bool
202 202
 	 */
Please login to merge, or discard this patch.
sources/subs/BBC/HtmlParser.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 	/**
48 48
 	 * Calls the functions to parse the handful of allowable HTML tags
49 49
 	 *
50
-	 * @param $data
50
+	 * @param string $data
51 51
 	 */
52 52
 	public function parse($data)
53 53
 	{
Please login to merge, or discard this patch.
sources/subs/Sound.subs.php 2 patches
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,8 +65,7 @@
 block discarded – undo
65 65
 		$sound_letter = substr($sound_letter, strpos($sound_letter, 'data') + 8);
66 66
 		switch ($word[$i] === 's' ? 0 : mt_rand(0, 2))
67 67
 		{
68
-			case 0:
69
-				for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
68
+			case 0 : for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
70 69
 				for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
71 70
 					$sound_word .= $word[$i] === 's' ? $sound_letter[$j] : chr(mt_rand(max(ord($sound_letter[$j]) - 1, 0x00), min(ord($sound_letter[$j]) + 1, 0xFF)));
72 71
 			break;
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@
 block discarded – undo
141 141
  * - Supports single range request only
142 142
  *
143 143
  * @param int $file_size
144
- * @return array
144
+ * @return integer[]
145 145
  */
146 146
 function set_range($file_size)
147 147
 {
Please login to merge, or discard this patch.
sources/subs/Html2Md.class.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 	/**
277 277
 	 * Looks for the text inside of <body> and then <html>, returning just the inner
278 278
 	 *
279
-	 * @param $text
279
+	 * @param string $text
280 280
 	 *
281 281
 	 * @return string
282 282
 	 */
@@ -1176,7 +1176,7 @@  discard block
 block discarded – undo
1176 1176
 	 * Helper function to adjust wrapping width for long-ish links
1177 1177
 	 *
1178 1178
 	 * @param string $markdown
1179
-	 * @param bool|int $buffer
1179
+	 * @param integer $buffer
1180 1180
 	 */
1181 1181
 	private function _check_link_lenght($markdown, $buffer = false)
1182 1182
 	{
Please login to merge, or discard this patch.
sources/subs/BBC/BBCParser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1205,7 +1205,7 @@
 block discarded – undo
1205 1205
 		// If we have footnotes, add them in at the end of the message
1206 1206
 		if (!empty($fn_num))
1207 1207
 		{
1208
-			$this->message .=  $this->smiley_marker . '<div class="bbc_footnotes">' . implode('', $this->fn_content) . '</div>' . $this->smiley_marker;
1208
+			$this->message .= $this->smiley_marker . '<div class="bbc_footnotes">' . implode('', $this->fn_content) . '</div>' . $this->smiley_marker;
1209 1209
 		}
1210 1210
 	}
1211 1211
 
Please login to merge, or discard this patch.