Completed
Pull Request — development (#3105)
by John
13:01
created
sources/Subs.php 1 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/Graphics.subs.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1401,7 +1401,7 @@  discard block
 block discarded – undo
1401 1401
  * @param int $height Height of the image
1402 1402
  * @param string $format Type of the image (valid types are png, jpeg, gif)
1403 1403
  *
1404
- * @return boolean|resource The image or false if neither Imagick nor GD are found
1404
+ * @return string|false The image or false if neither Imagick nor GD are found
1405 1405
  */
1406 1406
 function generateTextImage($text, $width = 100, $height = 100, $format = 'png')
1407 1407
 {
@@ -1439,7 +1439,7 @@  discard block
 block discarded – undo
1439 1439
  * @param int $height Height of the image
1440 1440
  * @param string $format Type of the image (valid types are png, jpeg, gif)
1441 1441
  *
1442
- * @return resource|boolean The image
1442
+ * @return string|false The image
1443 1443
  */
1444 1444
 function generateTextImageWithGD($text, $width = 100, $height = 100, $format = 'png')
1445 1445
 {
@@ -1506,7 +1506,7 @@  discard block
 block discarded – undo
1506 1506
  * @param int $height Height of the image
1507 1507
  * @param string $format Type of the image (valid types are png, jpeg, gif)
1508 1508
  *
1509
- * @return boolean|resource The image or false on error
1509
+ * @return string|false The image or false on error
1510 1510
  */
1511 1511
 function generateTextImageWithIM($text, $width = 100, $height = 100, $format = 'png')
1512 1512
 {
Please login to merge, or discard this patch.
sources/subs/Membergroups.subs.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1264,7 +1264,7 @@  discard block
 block discarded – undo
1264 1264
  * @package Membergroups
1265 1265
  * @param int $id_group
1266 1266
  * @param int $copy_from
1267
- * @param string[]|null $illegal_permissions
1267
+ * @param string[] $illegal_permissions
1268 1268
  * @todo another function with the same name in ManagePermissions.subs.php
1269 1269
  */
1270 1270
 function copyPermissions($id_group, $copy_from, $illegal_permissions)
@@ -2019,7 +2019,7 @@  discard block
 block discarded – undo
2019 2019
  *
2020 2020
  * @package Membergroups
2021 2021
  * @param int[]|null $members = null The members to update, null if all
2022
- * @param string[]|null $parameter2 = null
2022
+ * @param integer[] $parameter2 = null
2023 2023
  */
2024 2024
 function updatePostGroupStats($members = null, $parameter2 = null)
2025 2025
 {
Please login to merge, or discard this patch.
sources/subs/Mentioning.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -282,7 +282,7 @@
 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/admin/Reports.controller.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -740,7 +740,7 @@
 block discarded – undo
740 740
  * @param mixed[] $inc_data
741 741
  * @param int|null $custom_table = null
742 742
  *
743
- * @return bool
743
+ * @return false|null
744 744
  */
745 745
 function addData($inc_data, $custom_table = null)
746 746
 {
Please login to merge, or discard this patch.
sources/controllers/Mentions.controller.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -378,7 +378,7 @@
 block discarded – undo
378 378
 	 * @param bool $all : if true load all the mentions or type, otherwise only the unread
379 379
 	 * @param string $type : the type of mention
380 380
 	 *
381
-	 * @return array
381
+	 * @return integer
382 382
 	 */
383 383
 	public function list_loadMentions($start, $limit, $sort, $all, $type)
384 384
 	{
Please login to merge, or discard this patch.
sources/controllers/ProfileOptions.controller.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -521,7 +521,7 @@
 block discarded – undo
521 521
 	 *
522 522
 	 * @param bool $saving = false
523 523
 	 *
524
-	 * @return bool
524
+	 * @return boolean|null
525 525
 	 * @throws Elk_Exception
526 526
 	 */
527 527
 	public function action_authentication($saving = false)
Please login to merge, or discard this patch.
sources/CurlFetchWebdata.class.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
 	 * - Calls _setOptions to set the curl opts array values based on the defaults and user input
123 123
 	 *
124 124
 	 * @param string $url the site we are going to fetch
125
-	 * @param mixed[]|string $post_data data to send in the curl request as post data
125
+	 * @param string $post_data data to send in the curl request as post data
126 126
 	 *
127 127
 	 * @return Curl_Fetch_Webdata
128 128
 	 */
Please login to merge, or discard this patch.
sources/Security.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
  * @param string $message = ''
175 175
  * @param boolean $is_fatal = true
176 176
  *
177
- * @return bool
177
+ * @return boolean|null
178 178
  * @throws Elk_Exception
179 179
  */
180 180
 function is_not_guest($message = '', $is_fatal = true)
@@ -985,7 +985,7 @@  discard block
 block discarded – undo
985 985
  * @param string $action
986 986
  * @param bool   $is_fatal = true
987 987
  *
988
- * @return bool
988
+ * @return null|boolean
989 989
  * @throws Elk_Exception error_form_already_submitted
990 990
  */
991 991
 function checkSubmitOnce($action, $is_fatal = false)
Please login to merge, or discard this patch.