Completed
Push — 1.10.x ( e79d2f...52e3a4 )
by Angel Fernando Quiroz
144:06 queued 85:47
created
main/survey/survey.lib.php 1 patch
Doc Comments   +17 added lines, -15 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
      * Deletes all survey invitations of a user
48 48
      * @param int $user_id
49 49
      *
50
-     * @return boolean
50
+     * @return false|null
51 51
      * @assert ('') === false
52 52
      */
53 53
     public static function delete_all_survey_invitations_by_user($user_id)
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
      * Retrieves all the survey information
105 105
      *
106 106
      * @param integer $survey_id the id of the survey
107
-     * @param boolean $shared this parameter determines if
107
+     * @param integer $shared this parameter determines if
108 108
      * we have to get the information of a survey from the central (shared) database or from the
109 109
      * 		  course database
110 110
      * @param string course code optional
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
      * This function deletes a survey (and also all the question in that survey
572 572
      *
573 573
      * @param int $survey_id id of the survey that has to be deleted
574
-     * @return true
574
+     * @return boolean
575 575
      *
576 576
      * @author Patrick Cool <[email protected]>, Ghent University
577 577
      * @version January 2007
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
      *
757 757
      * @param int $survey_id id of the survey that has to be duplicated
758 758
      * @param int $courseId id of the course which survey has to be duplicated
759
-     * @return true
759
+     * @return boolean
760 760
      *
761 761
      * @author Eric Marguin <[email protected]>, Elixir Interactive
762 762
      * @version October 2007
@@ -796,7 +796,7 @@  discard block
 block discarded – undo
796 796
     /**
797 797
      * This function recalculates the number of people who have taken the survey (=filled at least one question)
798 798
      *
799
-     * @param int $survey_id the id of the survey somebody
799
+     * @param int $survey_data the id of the survey somebody
800 800
      * @return true
801 801
      *
802 802
      * @author Patrick Cool <[email protected]>, Ghent University
@@ -1367,7 +1367,7 @@  discard block
 block discarded – undo
1367 1367
      * This function deletes a shared survey question from the main database and all its options
1368 1368
      *
1369 1369
      * @param int $question_id the id of the question
1370
-     * @param int $shared
1370
+     * @param integer $survey_id
1371 1371
      *
1372 1372
      * @todo delete all the options of this question
1373 1373
      *
@@ -1494,8 +1494,8 @@  discard block
 block discarded – undo
1494 1494
      * This function deletes all the options of the questions of a given survey
1495 1495
      * This function is normally only called when a survey is deleted
1496 1496
      *
1497
-     * @param $survey_id the id of the survey that has to be deleted
1498
-     * @return true
1497
+     * @param integer $survey_id the id of the survey that has to be deleted
1498
+     * @return boolean
1499 1499
      *
1500 1500
      * @author Patrick Cool <[email protected]>, Ghent University
1501 1501
      * @version January 2007
@@ -1561,8 +1561,8 @@  discard block
 block discarded – undo
1561 1561
      * This function deletes all the answers anyone has given on this survey
1562 1562
      * This function is normally only called when a survey is deleted
1563 1563
      *
1564
-     * @param $survey_id the id of the survey that has to be deleted
1565
-     * @return true
1564
+     * @param integer $survey_id the id of the survey that has to be deleted
1565
+     * @return boolean
1566 1566
      *
1567 1567
      * @todo write the function
1568 1568
      *
@@ -1804,7 +1804,7 @@  discard block
 block discarded – undo
1804 1804
     /**
1805 1805
      * This function checks the parameters that are used in this page
1806 1806
      *
1807
-     * @return 	string 	The header, an error and the footer if any parameter fails, else it returns true
1807
+     * @return 	null|boolean 	The header, an error and the footer if any parameter fails, else it returns true
1808 1808
      * @author Patrick Cool <[email protected]>, Ghent University
1809 1809
      * @version February 2007
1810 1810
      */
@@ -2371,6 +2371,7 @@  discard block
 block discarded – undo
2371 2371
      * Display score data about a survey question
2372 2372
      * @param	array	Question info
2373 2373
      * @param	integer	The offset of results shown
2374
+     * @param integer $offset
2374 2375
      * @return	void 	(direct output)
2375 2376
      */
2376 2377
     public static function display_question_report_score($survey_data, $question, $offset)
@@ -3208,7 +3209,7 @@  discard block
 block discarded – undo
3208 3209
      * @param	array	User's answers
3209 3210
      * @param 	mixed	User ID or user details as string - Used as a string in the result string
3210 3211
      * @param	boolean	Whether to display user fields or not
3211
-     * @return	string	One line of the csv file
3212
+     * @return	string[]	One line of the csv file
3212 3213
      */
3213 3214
     public static function export_complete_report_row_xls(
3214 3215
         $survey_data,
@@ -3801,7 +3802,7 @@  discard block
 block discarded – undo
3801 3802
 
3802 3803
     /**
3803 3804
      * @param $params
3804
-     * @return bool|int
3805
+     * @return false|string
3805 3806
      */
3806 3807
     public static function save_invitation($params)
3807 3808
     {
@@ -3855,6 +3856,7 @@  discard block
 block discarded – undo
3855 3856
      *
3856 3857
      * @param int invitedUser - the userId (course user) or emailaddress of additional user
3857 3858
      * $param string $invitation_code - the unique invitation code for the URL
3859
+     * @param string|null $invitation_text
3858 3860
      * @return	void
3859 3861
      */
3860 3862
     public static function send_invitation_mail($invitedUser, $invitation_code, $invitation_title, $invitation_text)
@@ -4783,7 +4785,7 @@  discard block
 block discarded – undo
4783 4785
     /**
4784 4786
      * @author Isaac Flores Paz <[email protected]>
4785 4787
      * @param int $user_id - User ID
4786
-     * @param int $user_id_answer - User in survey answer table (user id or anonymus)
4788
+     * @param int $user_answer - User in survey answer table (user id or anonymus)
4787 4789
      * @return boolean
4788 4790
      */
4789 4791
     static function show_link_available($user_id, $survey_code, $user_answer)
@@ -4829,7 +4831,7 @@  discard block
 block discarded – undo
4829 4831
      * Display survey question chart
4830 4832
      * @param	array	Chart data
4831 4833
      * @param	boolean	Tells if the chart has a serie. False by default
4832
-     * @return	void 	(direct output)
4834
+     * @return	string 	(direct output)
4833 4835
      */
4834 4836
     public static function drawChart($chartData, $hasSerie = false, $chartContainerId = 'chartContainer')
4835 4837
     {
Please login to merge, or discard this patch.
main/newscorm/learnpath.class.php 1 patch
Doc Comments   +30 added lines, -26 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
      * @param	string	$course Course code
85 85
      * @param	integer	$lp_id
86 86
      * @param	integer	$user_id
87
-     * @return mixed True on success, false on error
87
+     * @return boolean True on success, false on error
88 88
      */
89 89
     public function __construct($course, $lp_id, $user_id)
90 90
     {
@@ -485,7 +485,7 @@  discard block
 block discarded – undo
485 485
      * @param int $max_time_allowed
486 486
      * @param int $userId
487 487
      *
488
-     * @return int
488
+     * @return false|string
489 489
      */
490 490
     public function add_item(
491 491
         $parent,
@@ -1036,7 +1036,7 @@  discard block
 block discarded – undo
1036 1036
      * @param	array $courseInfo
1037 1037
      * @param	integer	Learnpath ID
1038 1038
      * @param	string	Whether to delete data or keep it (default: 'keep', others: 'remove')
1039
-     * @return	boolean	True on success, false on failure (might change that to return number of elements deleted)
1039
+     * @return	false|null	True on success, false on failure (might change that to return number of elements deleted)
1040 1040
      */
1041 1041
     public function delete($courseInfo = null, $id = null, $delete = 'keep')
1042 1042
     {
@@ -1170,7 +1170,7 @@  discard block
 block discarded – undo
1170 1170
      * @param	integer	$id Elem ID (0 if first)
1171 1171
      * @param	integer	$remove Whether to remove the resource/data from the
1172 1172
      * system or leave it (default: 'keep', others 'remove')
1173
-     * @return	integer	Number of elements moved
1173
+     * @return	false|null	Number of elements moved
1174 1174
      * @todo implement resource removal
1175 1175
      */
1176 1176
     public function delete_item($id, $remove = 'keep')
@@ -1252,7 +1252,7 @@  discard block
 block discarded – undo
1252 1252
      * @param   array   $audio The array resulting of the $_FILES[mp3] element
1253 1253
      * @param   int     $max_time_allowed
1254 1254
      * @param   string  $url
1255
-     * @return  boolean True on success, false on error
1255
+     * @return  false|null True on success, false on error
1256 1256
      */
1257 1257
     public function edit_item(
1258 1258
         $id,
@@ -1775,7 +1775,7 @@  discard block
 block discarded – undo
1775 1775
 
1776 1776
     /**
1777 1777
      * Gets the first element URL.
1778
-     * @return	string	URL to load into the viewer
1778
+     * @return	false|null	URL to load into the viewer
1779 1779
      */
1780 1780
     public function first()
1781 1781
     {
@@ -2291,6 +2291,7 @@  discard block
 block discarded – undo
2291 2291
      * @param int $student_id
2292 2292
      * @param string Course code (optional)
2293 2293
      * @param int $sessionId
2294
+     * @param string $courseCode
2294 2295
      * @return	bool
2295 2296
      */
2296 2297
     public static function is_lp_visible_for_student(
@@ -2590,7 +2591,7 @@  discard block
 block discarded – undo
2590 2591
 
2591 2592
     /**
2592 2593
      * Gets the learnpath session id
2593
-     * @return	string	Learnpath theme
2594
+     * @return	integer	Learnpath theme
2594 2595
      */
2595 2596
     public function get_lp_session_id()
2596 2597
     {
@@ -2623,7 +2624,7 @@  discard block
 block discarded – undo
2623 2624
     /**
2624 2625
      * @param string $size
2625 2626
      * @param string $path_type
2626
-     * @return bool|string
2627
+     * @return string|false
2627 2628
      */
2628 2629
     public function get_preview_image_path($size = null, $path_type = 'web')
2629 2630
     {
@@ -2769,6 +2770,8 @@  discard block
 block discarded – undo
2769 2770
      * Returns the XML DOM document's node
2770 2771
      * @param	resource	Reference to a list of objects to search for the given ITEM_*
2771 2772
      * @param	string		The identifier to look for
2773
+     * @param DOMNodeList $children
2774
+     * @param string $id
2772 2775
      * @return	mixed		The reference to the element found with that identifier. False if not found
2773 2776
      */
2774 2777
     public function get_scorm_xml_node(& $children, $id)
@@ -3016,7 +3019,7 @@  discard block
 block discarded – undo
3016 3019
     /**
3017 3020
      * Generate and return the table of contents for this learnpath. The (flat) table returned can be
3018 3021
      * used by get_html_toc() to be ready to display
3019
-     * @return	array	TOC as a table with 4 elements per row: title, link, status and level
3022
+     * @return	boolean	TOC as a table with 4 elements per row: title, link, status and level
3020 3023
      */
3021 3024
     public function get_toc()
3022 3025
     {
@@ -3152,7 +3155,7 @@  discard block
 block discarded – undo
3152 3155
     }
3153 3156
 
3154 3157
     /**
3155
-     * @return array
3158
+     * @return string[]
3156 3159
      */
3157 3160
     public static function getChapterTypes()
3158 3161
     {
@@ -4054,7 +4057,7 @@  discard block
 block discarded – undo
4054 4057
      * Open a resource = initialise all local variables relative to this resource. Depending on the child
4055 4058
      * class, this might be redefined to allow several behaviours depending on the document type.
4056 4059
      * @param integer Resource ID
4057
-     * @return boolean True on success, false otherwise
4060
+     * @return boolean|null True on success, false otherwise
4058 4061
      */
4059 4062
     public function open($id)
4060 4063
     {
@@ -4183,7 +4186,7 @@  discard block
 block discarded – undo
4183 4186
      * Can be used as abstract
4184 4187
      * @param	integer	$lp_id Learnpath id
4185 4188
      * @param	string	$set_visibility New visibility (v/i - visible/invisible)
4186
-     * @return bool
4189
+     * @return false|null
4187 4190
      */
4188 4191
     public static function toggle_publish($lp_id, $set_visibility = 'v')
4189 4192
     {
@@ -4268,7 +4271,7 @@  discard block
 block discarded – undo
4268 4271
      * Make sure the results are saved with anoter method. This method should probably be
4269 4272
      * redefined in children classes.
4270 4273
      * To use a similar method  statically, use the create_new_attempt() method
4271
-     * @return string URL to load in the viewer
4274
+     * @return boolean URL to load in the viewer
4272 4275
      */
4273 4276
     public function restart()
4274 4277
     {
@@ -4346,6 +4349,7 @@  discard block
 block discarded – undo
4346 4349
      * Saves the given item
4347 4350
      * @param	integer	$item_id. Optional (will take from $_REQUEST if null)
4348 4351
      * @param	boolean	$from_outside Save from url params (true) or from current attributes (false). Optional. Defaults to true
4352
+     * @param integer $item_id
4349 4353
      * @return	boolean
4350 4354
      */
4351 4355
     public function save_item($item_id = null, $from_outside = true)
@@ -4843,7 +4847,7 @@  discard block
 block discarded – undo
4843 4847
 
4844 4848
     /**
4845 4849
      * Sets use_max_score
4846
-     * @param   string  $use_max_score Optional string giving the new location of this learnpath
4850
+     * @param   integer  $use_max_score Optional string giving the new location of this learnpath
4847 4851
      * @return  boolean True on success / False on error
4848 4852
      */
4849 4853
     public function set_use_max_score($use_max_score = 1)
@@ -5244,6 +5248,7 @@  discard block
 block discarded – undo
5244 5248
      * Register the attempt mode into db thanks to flags prevent_reinit and seriousgame_mode flags
5245 5249
      *
5246 5250
      * @param string 'seriousgame', 'single' or 'multiple'
5251
+     * @param string $mode
5247 5252
      * @return boolean
5248 5253
      * @author ndiechburg <[email protected]>
5249 5254
      **/
@@ -5286,7 +5291,7 @@  discard block
 block discarded – undo
5286 5291
     /**
5287 5292
      * Switch between multiple attempt, single attempt or serious_game mode (only for scorm)
5288 5293
      *
5289
-     * @return boolean
5294
+     * @return boolean|null
5290 5295
      * @author ndiechburg <[email protected]>
5291 5296
      **/
5292 5297
     public function switch_attempt_mode()
@@ -5477,7 +5482,6 @@  discard block
 block discarded – undo
5477 5482
     /**
5478 5483
      * Function that creates a html list of learning path items so that we can add audio files to them
5479 5484
      * @author Kevin Van Den Haute
5480
-     * @param int $lp_id
5481 5485
      * @return string
5482 5486
      */
5483 5487
     public function overview()
@@ -5852,7 +5856,7 @@  discard block
 block discarded – undo
5852 5856
     /**
5853 5857
      * This function builds the action menu
5854 5858
      * @param bool $returnContent
5855
-     * @return void
5859
+     * @return string|null
5856 5860
      */
5857 5861
     public function build_action_menu($returnContent = false)
5858 5862
     {
@@ -6371,7 +6375,7 @@  discard block
 block discarded – undo
6371 6375
     /**
6372 6376
      * Function that displays a list with al the resources that
6373 6377
      * could be added to the learning path
6374
-     * @return string
6378
+     * @return boolean
6375 6379
      */
6376 6380
     public function display_resources()
6377 6381
     {
@@ -8875,7 +8879,7 @@  discard block
 block discarded – undo
8875 8879
 
8876 8880
     /**
8877 8881
      * Creates a list with all the student publications in it
8878
-     * @return unknown
8882
+     * @return string
8879 8883
      */
8880 8884
     public function get_student_publications()
8881 8885
     {
@@ -9827,7 +9831,7 @@  discard block
 block discarded – undo
9827 9831
 
9828 9832
     /**
9829 9833
      * @param int $lp_id
9830
-     * @return bool
9834
+     * @return false|null
9831 9835
      */
9832 9836
     public function scorm_export_to_pdf($lp_id)
9833 9837
     {
@@ -10344,6 +10348,7 @@  discard block
 block discarded – undo
10344 10348
     }
10345 10349
 
10346 10350
     /**
10351
+     * @param string $courseCode
10347 10352
      * @return \learnpath
10348 10353
      */
10349 10354
     public static function getLpFromSession($courseCode, $lp_id, $user_id)
@@ -10363,7 +10368,7 @@  discard block
 block discarded – undo
10363 10368
 
10364 10369
     /**
10365 10370
      * @param int $itemId
10366
-     * @return learnpathItem|false
10371
+     * @return string
10367 10372
      */
10368 10373
     public function getItem($itemId)
10369 10374
     {
@@ -10413,7 +10418,6 @@  discard block
 block discarded – undo
10413 10418
     /**
10414 10419
      * Set whether this is a learning path with the possibility to subscribe
10415 10420
      * users or not
10416
-     * @param int $subscribeUsers (0 = false, 1 = true)
10417 10421
      */
10418 10422
     public function setSubscribeUsers($value)
10419 10423
     {
@@ -10538,7 +10542,7 @@  discard block
 block discarded – undo
10538 10542
 
10539 10543
     /**
10540 10544
      * Get the item of exercise type (evaluation type)
10541
-     * @return array The final evaluation. Otherwise return false
10545
+     * @return integer The final evaluation. Otherwise return false
10542 10546
      */
10543 10547
     public function getFinalEvaluationItem()
10544 10548
     {
@@ -10762,7 +10766,7 @@  discard block
 block discarded – undo
10762 10766
     /**
10763 10767
      * Create a forum for this learning path
10764 10768
      * @param type $forumCategoryId
10765
-     * @return int The forum ID if was created. Otherwise return false
10769
+     * @return false|string The forum ID if was created. Otherwise return false
10766 10770
      */
10767 10771
     public function createForum($forumCategoryId)
10768 10772
     {
@@ -10811,7 +10815,7 @@  discard block
 block discarded – undo
10811 10815
     /**
10812 10816
      * Get the LP Final Item Template
10813 10817
      *
10814
-     * @return html
10818
+     * @return string
10815 10819
      */
10816 10820
     private function getFinalItemTemplate()
10817 10821
     {
@@ -10834,7 +10838,7 @@  discard block
 block discarded – undo
10834 10838
     /**
10835 10839
      * Get the LP Final Item form
10836 10840
      *
10837
-     * @return html
10841
+     * @return string
10838 10842
      */
10839 10843
     public function getFinalItemForm()
10840 10844
     {
Please login to merge, or discard this patch.
main/newscorm/lp_final_item.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@
 block discarded – undo
116 116
  * @param int $sessionId
117 117
  * @param string $downloadCertificateLink
118 118
  * @param string $badgeLink
119
- * @return mixed|string
119
+ * @return string
120 120
  */
121 121
 function generateLPFinalItemTemplate($lpItemId, $courseCode, $sessionId=0, $downloadCertificateLink='', $badgeLink='')
122 122
 {
Please login to merge, or discard this patch.
main/inc/lib/userportal.lib.php 1 patch
Doc Comments   +8 added lines, -7 removed lines patch added patch discarded remove patch
@@ -657,6 +657,7 @@  discard block
 block discarded – undo
657 657
     * retrieves all the courses that the user has already subscribed to
658 658
     * @author Patrick Cool <[email protected]>, Ghent University, Belgium
659 659
     * @param int $user_id: the id of the user
660
+    * @param integer $user_id
660 661
     * @return array an array containing all the information of the courses of the given user
661 662
     */
662 663
     public function get_courses_of_user($user_id)
@@ -707,13 +708,13 @@  discard block
 block discarded – undo
707 708
 
708 709
     /**
709 710
      * @todo use the template system
710
-     * @param $title
711
-     * @param $content
711
+     * @param string|null $title
712
+     * @param string $content
712 713
      * @param string $id
713 714
      * @param array $params
714 715
      * @param string $idAccordion
715 716
      * @param string $idCollapse
716
-     * @return null|string
717
+     * @return string
717 718
      */
718 719
     public function show_right_block(
719 720
         $title,
@@ -937,7 +938,7 @@  discard block
 block discarded – undo
937 938
     }
938 939
 
939 940
     /**
940
-     * @return null|string
941
+     * @return string
941 942
      */
942 943
     public function return_course_block()
943 944
     {
@@ -1590,8 +1591,8 @@  discard block
 block discarded – undo
1590 1591
 
1591 1592
     /**
1592 1593
      * Return HTML code for personal user course category
1593
-     * @param $id
1594
-     * @param $title
1594
+     * @param integer $id
1595
+     * @param string $title
1595 1596
      * @return string
1596 1597
      */
1597 1598
     private static function getHtmlForUserCategory($id, $title)
@@ -1612,7 +1613,7 @@  discard block
 block discarded – undo
1612 1613
     /**
1613 1614
      * return HTML code for course display in session view
1614 1615
      * @param array $courseInfo
1615
-     * @param $userCategoryId
1616
+     * @param integer $userCategoryId
1616 1617
      * @param bool $displayButton
1617 1618
      * @param $loadDirs
1618 1619
      * @return string
Please login to merge, or discard this patch.
plugin/bbb/lib/bbb_plugin.class.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
     }
43 43
 
44 44
     /**
45
-     * @return BBBPlugin|null
45
+     * @return BBBPlugin
46 46
      */
47 47
     public static function create()
48 48
     {
Please login to merge, or discard this patch.
main/inc/lib/database.lib.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
      *
67 67
      * @param string $table
68 68
      *
69
-     * @return mixed
69
+     * @return string
70 70
      */
71 71
     public static function get_main_table($table)
72 72
     {
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 
266 266
     /**
267 267
      * Frees all the memory associated with the provided result identifier.
268
-     * @return bool     Returns TRUE on success or FALSE on failure.
268
+     * @return boolean|null     Returns TRUE on success or FALSE on failure.
269 269
      * Notes: Use this method if you are concerned about how much memory is being used for queries that return large result sets.
270 270
      * Anyway, all associated result memory is automatically freed at the end of the script's execution.
271 271
      */
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
      * @param array     $attributes
382 382
      * @param bool      $show_query
383 383
      *
384
-     * @return bool|int
384
+     * @return false|string
385 385
      */
386 386
     public static function insert($table_name, $attributes, $show_query = false)
387 387
     {
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
     }
675 675
 
676 676
     /**
677
-     * @param $table
677
+     * @param string $table
678 678
      * @return \Doctrine\DBAL\Schema\Column[]
679 679
      */
680 680
     public static function listTableColumns($table) 
Please login to merge, or discard this patch.
main/inc/lib/internationalization.lib.php 1 patch
Doc Comments   +20 added lines, -14 removed lines patch added patch discarded remove patch
@@ -437,6 +437,7 @@  discard block
 block discarded – undo
437 437
  * If null, the timezone will be determined based on user preference,
438 438
  * or timezone chosen by the admin for the platform.
439 439
  * @param string The timezone to be converted from. If null, UTC will be assumed.
440
+ * @param string $to_timezone
440 441
  * @return string The converted time formatted as Y-m-d H:i:s
441 442
  *
442 443
  * @author Guillaume Viguier <[email protected]>
@@ -793,6 +794,7 @@  discard block
 block discarded – undo
793 794
  * @param mixed The time to be converted
794 795
  * @param mixed Format to be used (TIME_NO_SEC_FORMAT, DATE_FORMAT_SHORT, DATE_FORMAT_LONG, DATE_TIME_FORMAT_LONG)
795 796
  * @param string Timezone to be converted from. If null, UTC will be assumed.
797
+ * @param string $from_timezone
796 798
  * @return string Converted and localized date
797 799
  *
798 800
  * @author Guillaume Viguier <[email protected]>
@@ -862,7 +864,7 @@  discard block
 block discarded – undo
862 864
  * @param int/string $format (optional)	The person name format. It may be a pattern-string (for example '%t %l, %f' or '%T %F %L', ...) or some of the constants PERSON_NAME_COMMON_CONVENTION (default), PERSON_NAME_WESTERN_ORDER, PERSON_NAME_EASTERN_ORDER, PERSON_NAME_LIBRARY_ORDER.
863 865
  * @param string $language (optional)	The language id. If it is omitted, the current interface language is assumed. This parameter has meaning with the format PERSON_NAME_COMMON_CONVENTION only.
864 866
  * @param string $encoding (optional)	The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
865
- * @return bool							The result is sort of full name of the person.
867
+ * @return string							The result is sort of full name of the person.
866 868
  * Sample results:
867 869
  * Peter Ustinoff or Dr. Peter Ustinoff     - the Western order
868 870
  * Ustinoff Peter or Dr. Ustinoff Peter     - the Eastern order
@@ -956,7 +958,7 @@  discard block
 block discarded – undo
956 958
 
957 959
 /**
958 960
  * Checks whether a given format represents person name in Western order (for which first name is first).
959
- * @param int/string $format (optional)	The person name format. It may be a pattern-string (for example '%t. %l, %f') or some of the constants PERSON_NAME_COMMON_CONVENTION (default), PERSON_NAME_WESTERN_ORDER, PERSON_NAME_EASTERN_ORDER, PERSON_NAME_LIBRARY_ORDER.
961
+ * @param integer $format (optional)	The person name format. It may be a pattern-string (for example '%t. %l, %f') or some of the constants PERSON_NAME_COMMON_CONVENTION (default), PERSON_NAME_WESTERN_ORDER, PERSON_NAME_EASTERN_ORDER, PERSON_NAME_LIBRARY_ORDER.
960 962
  * @param string $language (optional)	The language id. If it is omitted, the current interface language is assumed. This parameter has meaning with the format PERSON_NAME_COMMON_CONVENTION only.
961 963
  * @return bool							The result TRUE means that the order is first_name last_name, FALSE means last_name first_name.
962 964
  * Note: You may use this function for determing the order of the fields or columns "First name" and "Last name" in forms, tables and reports.
@@ -1184,8 +1186,8 @@  discard block
 block discarded – undo
1184 1186
 
1185 1187
 /**
1186 1188
  * This function returns a string or an array with all occurrences of search in subject (ignoring case) replaced with the given replace value.
1187
- * @param mixed $search					String or array of strings to be found.
1188
- * @param mixed $replace				String or array of strings used for replacement.
1189
+ * @param string $search					String or array of strings to be found.
1190
+ * @param string $replace				String or array of strings used for replacement.
1189 1191
  * @param mixed $subject				String or array of strings being searched.
1190 1192
  * @param int $count (optional)			The number of matched and replaced needles will be returned in count, which is passed by reference.
1191 1193
  * @param string $encoding (optional)	The used internally by this function character encoding.
@@ -1248,10 +1250,10 @@  discard block
 block discarded – undo
1248 1250
 /**
1249 1251
  * Finds first occurrence of a string within another, case insensitive.
1250 1252
  * @param string $haystack					The string from which to get the first occurrence.
1251
- * @param mixed $needle						The string to be found.
1253
+ * @param string $needle						The string to be found.
1252 1254
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
1253 1255
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
1254
- * @return mixed							Returns the portion of $haystack, or FALSE if $needle is not found.
1256
+ * @return false|string							Returns the portion of $haystack, or FALSE if $needle is not found.
1255 1257
  * Notes:
1256 1258
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
1257 1259
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence of $needle.
@@ -1307,7 +1309,7 @@  discard block
 block discarded – undo
1307 1309
  * @param mixed $needle						The string which first character is to be found.
1308 1310
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
1309 1311
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
1310
- * @return mixed							Returns the portion of $haystack, or FALSE if the first character from $needle is not found.
1312
+ * @return false|string							Returns the portion of $haystack, or FALSE if the first character from $needle is not found.
1311 1313
  * Notes:
1312 1314
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
1313 1315
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence.
@@ -1357,7 +1359,7 @@  discard block
 block discarded – undo
1357 1359
  * @param string $needle				The string to be found.
1358 1360
  * @param int $offset (optional)		$offset may be specified to begin searching an arbitrary position. Negative values will stop searching at an arbitrary point prior to the end of the string.
1359 1361
  * @param string $encoding (optional)	The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
1360
- * @return mixed						Returns the numeric position of the first occurrence of $needle in the $haystack, or FALSE if $needle is not found.
1362
+ * @return integer|null						Returns the numeric position of the first occurrence of $needle in the $haystack, or FALSE if $needle is not found.
1361 1363
  * Note: The first character's position is 0, the second character position is 1, and so on.
1362 1364
  * This function is aimed at replacing the functions strrpos() and mb_strrpos() for human-language strings.
1363 1365
  * @link http://php.net/manual/en/function.strrpos
@@ -1374,7 +1376,7 @@  discard block
 block discarded – undo
1374 1376
  * @param mixed $needle						The string to be found.
1375 1377
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
1376 1378
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
1377
- * @return mixed							Returns the portion of $haystack, or FALSE if $needle is not found.
1379
+ * @return false|string							Returns the portion of $haystack, or FALSE if $needle is not found.
1378 1380
  * Notes:
1379 1381
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
1380 1382
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence of $needle.
@@ -1517,7 +1519,7 @@  discard block
 block discarded – undo
1517 1519
  * 										Note that this changes the return value in an array where every element is an array consisting of the matched string at index 0 and its string offset into subject at index 1.
1518 1520
  * @param int $offset (optional)		Normally, the search starts from the beginning of the subject string. The optional parameter offset can be used to specify the alternate place from which to start the search.
1519 1521
  * @param string $encoding (optional)	The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
1520
- * @return int|boolean					Returns the number of times pattern matches or FALSE if an error occurred.
1522
+ * @return integer					Returns the number of times pattern matches or FALSE if an error occurred.
1521 1523
  * @link http://php.net/preg_match
1522 1524
  */
1523 1525
 function api_preg_match($pattern, $subject, &$matches = null, $flags = 0, $offset = 0, $encoding = null) {
@@ -1540,7 +1542,7 @@  discard block
 block discarded – undo
1540 1542
  * If no order flag is given, PREG_PATTERN_ORDER is assumed.
1541 1543
  * @param int $offset (optional)		Normally, the search starts from the beginning of the subject string. The optional parameter offset can be used to specify the alternate place from which to start the search.
1542 1544
  * @param string $encoding (optional)	The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
1543
- * @return int|boolean					Returns the number of full pattern matches (which might be zero), or FALSE if an error occurred.
1545
+ * @return integer					Returns the number of full pattern matches (which might be zero), or FALSE if an error occurred.
1544 1546
  * @link http://php.net/preg_match_all
1545 1547
  */
1546 1548
 function api_preg_match_all($pattern, $subject, &$matches, $flags = PREG_PATTERN_ORDER, $offset = 0, $encoding = null) {
@@ -1555,8 +1557,8 @@  discard block
 block discarded – undo
1555 1557
 
1556 1558
 /**
1557 1559
  * Performs a regular expression search and replace, UTF-8 aware when it is applicable.
1558
- * @param string|array $pattern			The pattern to search for. It can be either a string or an array with strings.
1559
- * @param string|array $replacement		The string or an array with strings to replace.
1560
+ * @param string $pattern			The pattern to search for. It can be either a string or an array with strings.
1561
+ * @param string $replacement		The string or an array with strings to replace.
1560 1562
  * @param string|array $subject			The string or an array with strings to search and replace.
1561 1563
  * @param int $limit					The maximum possible replacements for each pattern in each subject string. Defaults to -1 (no limit).
1562 1564
  * @param int &$count					If specified, this variable will be filled with the number of replacements done.
@@ -1808,6 +1810,7 @@  discard block
 block discarded – undo
1808 1810
 /**
1809 1811
  * Checks a string for UTF-8 validity.
1810 1812
  *
1813
+ * @param string $string
1811 1814
  */
1812 1815
 function api_is_valid_utf8(&$string)
1813 1816
 {
@@ -1950,7 +1953,7 @@  discard block
 block discarded – undo
1950 1953
 /**
1951 1954
  * Replaces non-valid formats for person names with the default (English) format.
1952 1955
  * @param string $format	The input format to be verified.
1953
- * @return bool				Returns the same format if is is valid, otherwise returns a valid English format.
1956
+ * @return string				Returns the same format if is is valid, otherwise returns a valid English format.
1954 1957
  */
1955 1958
 function _api_validate_person_name_format($format) {
1956 1959
     if (empty($format) || stripos($format, '%f') === false || stripos($format, '%l') === false) {
@@ -2077,6 +2080,9 @@  discard block
 block discarded – undo
2077 2080
 
2078 2081
 // This function checks whether the function _api_convert_encoding() (the php-
2079 2082
 // implementation) is able to convert from/to a given encoding.
2083
+/**
2084
+ * @param string $encoding
2085
+ */
2080 2086
 function _api_convert_encoding_supports($encoding) {
2081 2087
     static $supports = array();
2082 2088
     if (!isset($supports[$encoding])) {
Please login to merge, or discard this patch.