Completed
Pull Request — development (#3105)
by John
13:01
created
sources/database/Db-mysql.class.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -332,7 +332,7 @@
 block discarded – undo
332 332
 	 * http://www.greywyvern.com/code/php/utf8_html.phps
333 333
 	 *
334 334
 	 * @param string $c
335
-	 * @return integer|false
335
+	 * @return integer
336 336
 	 */
337 337
 	private function _uniord($c)
338 338
 	{
Please login to merge, or discard this patch.
sources/subs/Boards.subs.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2084,7 +2084,7 @@
 block discarded – undo
2084 2084
  * Count boards all or specific depending on argument, redirect boards excluded by default.
2085 2085
  *
2086 2086
  * @package Boards
2087
- * @param mixed[]|string $conditions is an associative array that holds the board or the cat IDs
2087
+ * @param string $conditions is an associative array that holds the board or the cat IDs
2088 2088
  *              'categories' => an array of category IDs (it accepts a single ID too)
2089 2089
  *              'boards' => an array of board IDs (it accepts a single ID too)
2090 2090
  *              if conditions is set to 'all' (not an array) all the boards are queried
Please login to merge, or discard this patch.
sources/subs/Unread.class.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 	 * Sets the sorting query and the direction
117 117
 	 *
118 118
 	 * @param string $query - The query to be used in the ORDER clause
119
-	 * @param bool|int $asc - If the sorting is ascending or not
119
+	 * @param boolean $asc - If the sorting is ascending or not
120 120
 	 */
121 121
 	public function setSorting($query, $asc)
122 122
 	{
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 	 *                       the messages table
219 219
 	 * @param int $start - position to start the query
220 220
 	 * @param int $limit - number of entries to grab
221
-	 * @param bool|int $include_avatars - if avatars should be retrieved as well
221
+	 * @param boolean $include_avatars - if avatars should be retrieved as well
222 222
 	 * @return mixed[] - see Topic_Util::prepareContext
223 223
 	 */
224 224
 	private function _getUnreadTopics($join, $start, $limit, $include_avatars = false)
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 	 *
384 384
 	 * @param int $start - position to start the query
385 385
 	 * @param int $limit - number of entries to grab
386
-	 * @param bool|int $include_avatars - if avatars should be retrieved as well
386
+	 * @param boolean $include_avatars - if avatars should be retrieved as well
387 387
 	 * @return mixed[] - see Topic_Util::prepareContext
388 388
 	 */
389 389
 	private function _getUnreadReplies($start, $limit, $include_avatars = false)
Please login to merge, or discard this patch.
sources/subs/TopicsMerge.class.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
 	/**
136 136
 	 * The first error occurred
137 137
 	 *
138
-	 * @return array|string
138
+	 * @return string|null
139 139
 	 */
140 140
 	public function firstError()
141 141
 	{
Please login to merge, or discard this patch.
sources/subs/Package.subs.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
  * @param bool $single_file = false
29 29
  * @param bool $overwrite = false
30 30
  * @param string[]|null $files_to_extract = null
31
- * @return array|false
31
+ * @return string
32 32
  */
33 33
 function read_tgz_file($gzfilename, $destination, $single_file = false, $overwrite = false, $files_to_extract = null)
34 34
 {
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
  * @param bool $single_file = false,
78 78
  * @param bool $overwrite = false,
79 79
  * @param string[]|null $files_to_extract = null
80
- * @return array|false
80
+ * @return string
81 81
  */
82 82
 function read_tgz_data($data, $destination, $single_file = false, $overwrite = false, $files_to_extract = null)
83 83
 {
Please login to merge, or discard this patch.
sources/subs/Topic.subs.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1330,7 +1330,7 @@
 block discarded – undo
1330 1330
  *
1331 1331
  * @param int $topic id of a topic
1332 1332
  * @param int|null $msg the id of a message, if empty, t.id_first_msg is used
1333
- * @return mixed[]|boolean to topic attributes
1333
+ * @return string|null to topic attributes
1334 1334
  */
1335 1335
 function getTopicInfoByMsg($topic, $msg = null)
1336 1336
 {
Please login to merge, or discard this patch.
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/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/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.