Completed
Pull Request — 1.11.x (#1558)
by José
23:40
created
src/Chamilo/PageBundle/Entity/User.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
     /**
908 908
      * Get pictureUri
909 909
      *
910
-     * @return Media
910
+     * @return string
911 911
      */
912 912
     public function getPictureUri()
913 913
     {
@@ -1284,7 +1284,7 @@  discard block
 block discarded – undo
1284 1284
     }
1285 1285
 
1286 1286
     /**
1287
-     * @return Media
1287
+     * @return string
1288 1288
      */
1289 1289
     public function getAvatar()
1290 1290
     {
@@ -2051,7 +2051,7 @@  discard block
 block discarded – undo
2051 2051
       /**
2052 2052
      * Returns the user roles
2053 2053
      *
2054
-     * @return array The roles
2054
+     * @return string[] The roles
2055 2055
      */
2056 2056
     public function getRoles()
2057 2057
     {
Please login to merge, or discard this patch.
src/Chamilo/UserBundle/Entity/User.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -995,7 +995,7 @@  discard block
 block discarded – undo
995 995
     /**
996 996
      * Get pictureUri
997 997
      *
998
-     * @return Media
998
+     * @return string
999 999
      */
1000 1000
     public function getPictureUri()
1001 1001
     {
@@ -1303,7 +1303,7 @@  discard block
 block discarded – undo
1303 1303
     }
1304 1304
 
1305 1305
     /**
1306
-     * @return Media
1306
+     * @return string
1307 1307
      */
1308 1308
     public function getAvatar()
1309 1309
     {
@@ -2078,7 +2078,7 @@  discard block
 block discarded – undo
2078 2078
       /**
2079 2079
      * Returns the user roles
2080 2080
      *
2081
-     * @return array The roles
2081
+     * @return string[] The roles
2082 2082
      */
2083 2083
     public function getRoles()
2084 2084
     {
@@ -2403,7 +2403,7 @@  discard block
 block discarded – undo
2403 2403
     /**
2404 2404
      * Check if the user has the skill
2405 2405
      * @param Skill $skill The skill
2406
-     * @return boolean
2406
+     * @return boolean|null
2407 2407
      */
2408 2408
     public function hasSkill(Skill $skill)
2409 2409
     {
Please login to merge, or discard this patch.
main/lp/learnpath.class.php 1 patch
Doc Comments   +25 added lines, -22 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
      * @param   string $course Course code
88 88
      * @param   integer $lp_id
89 89
      * @param   integer $user_id
90
-     * @return  mixed True on success, false on error
90
+     * @return  boolean True on success, false on error
91 91
      */
92 92
     public function __construct($course, $lp_id, $user_id)
93 93
     {
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
      * @param int $max_time_allowed
492 492
      * @param int $userId
493 493
      *
494
-     * @return int
494
+     * @return false|string
495 495
      */
496 496
     public function add_item(
497 497
         $parent,
@@ -1043,7 +1043,7 @@  discard block
 block discarded – undo
1043 1043
      * @param	array $courseInfo
1044 1044
      * @param	integer	Learnpath ID
1045 1045
      * @param	string	Whether to delete data or keep it (default: 'keep', others: 'remove')
1046
-     * @return	boolean	True on success, false on failure (might change that to return number of elements deleted)
1046
+     * @return	false|null	True on success, false on failure (might change that to return number of elements deleted)
1047 1047
      */
1048 1048
     public function delete($courseInfo = null, $id = null, $delete = 'keep')
1049 1049
     {
@@ -1182,7 +1182,7 @@  discard block
 block discarded – undo
1182 1182
      * @param	integer	$id Elem ID (0 if first)
1183 1183
      * @param	integer	$remove Whether to remove the resource/data from the
1184 1184
      * system or leave it (default: 'keep', others 'remove')
1185
-     * @return	integer	Number of elements moved
1185
+     * @return	false|null	Number of elements moved
1186 1186
      * @todo implement resource removal
1187 1187
      */
1188 1188
     public function delete_item($id, $remove = 'keep')
@@ -1264,7 +1264,7 @@  discard block
 block discarded – undo
1264 1264
      * @param   array   $audio The array resulting of the $_FILES[mp3] element
1265 1265
      * @param   int     $max_time_allowed
1266 1266
      * @param   string  $url
1267
-     * @return  boolean True on success, false on error
1267
+     * @return  false|null True on success, false on error
1268 1268
      */
1269 1269
     public function edit_item(
1270 1270
         $id,
@@ -1783,7 +1783,7 @@  discard block
 block discarded – undo
1783 1783
 
1784 1784
     /**
1785 1785
      * Gets the first element URL.
1786
-     * @return	string	URL to load into the viewer
1786
+     * @return	false|null	URL to load into the viewer
1787 1787
      */
1788 1788
     public function first()
1789 1789
     {
@@ -2297,6 +2297,7 @@  discard block
 block discarded – undo
2297 2297
      * @param int $student_id
2298 2298
      * @param string Course code (optional)
2299 2299
      * @param int $sessionId
2300
+     * @param string $courseCode
2300 2301
      * @return	bool
2301 2302
      */
2302 2303
     public static function is_lp_visible_for_student(
@@ -2594,7 +2595,7 @@  discard block
 block discarded – undo
2594 2595
 
2595 2596
     /**
2596 2597
      * Gets the learnpath session id
2597
-     * @return	string	Learnpath theme
2598
+     * @return	integer	Learnpath theme
2598 2599
      */
2599 2600
     public function get_lp_session_id()
2600 2601
     {
@@ -2627,7 +2628,7 @@  discard block
 block discarded – undo
2627 2628
     /**
2628 2629
      * @param string $size
2629 2630
      * @param string $path_type
2630
-     * @return bool|string
2631
+     * @return string|false
2631 2632
      */
2632 2633
     public function get_preview_image_path($size = null, $path_type = 'web')
2633 2634
     {
@@ -2773,6 +2774,8 @@  discard block
 block discarded – undo
2773 2774
      * Returns the XML DOM document's node
2774 2775
      * @param	resource	Reference to a list of objects to search for the given ITEM_*
2775 2776
      * @param	string		The identifier to look for
2777
+     * @param DOMNodeList $children
2778
+     * @param string $id
2776 2779
      * @return	mixed		The reference to the element found with that identifier. False if not found
2777 2780
      */
2778 2781
     public function get_scorm_xml_node(& $children, $id)
@@ -3020,7 +3023,7 @@  discard block
 block discarded – undo
3020 3023
     /**
3021 3024
      * Generate and return the table of contents for this learnpath. The (flat) table returned can be
3022 3025
      * used by get_html_toc() to be ready to display
3023
-     * @return	array	TOC as a table with 4 elements per row: title, link, status and level
3026
+     * @return	boolean	TOC as a table with 4 elements per row: title, link, status and level
3024 3027
      */
3025 3028
     public function get_toc()
3026 3029
     {
@@ -3156,7 +3159,7 @@  discard block
 block discarded – undo
3156 3159
     }
3157 3160
 
3158 3161
     /**
3159
-     * @return array
3162
+     * @return string[]
3160 3163
      */
3161 3164
     public static function getChapterTypes()
3162 3165
     {
@@ -4062,7 +4065,7 @@  discard block
 block discarded – undo
4062 4065
      * Open a resource = initialise all local variables relative to this resource. Depending on the child
4063 4066
      * class, this might be redefined to allow several behaviours depending on the document type.
4064 4067
      * @param integer Resource ID
4065
-     * @return boolean True on success, false otherwise
4068
+     * @return boolean|null True on success, false otherwise
4066 4069
      */
4067 4070
     public function open($id)
4068 4071
     {
@@ -4191,7 +4194,7 @@  discard block
 block discarded – undo
4191 4194
      * Can be used as abstract
4192 4195
      * @param	integer	$lp_id Learnpath id
4193 4196
      * @param	string	$set_visibility New visibility (v/i - visible/invisible)
4194
-     * @return bool
4197
+     * @return false|null
4195 4198
      */
4196 4199
     public static function toggle_publish($lp_id, $set_visibility = 'v')
4197 4200
     {
@@ -4276,7 +4279,7 @@  discard block
 block discarded – undo
4276 4279
      * Make sure the results are saved with anoter method. This method should probably be
4277 4280
      * redefined in children classes.
4278 4281
      * To use a similar method  statically, use the create_new_attempt() method
4279
-     * @return string URL to load in the viewer
4282
+     * @return boolean URL to load in the viewer
4280 4283
      */
4281 4284
     public function restart()
4282 4285
     {
@@ -4354,6 +4357,7 @@  discard block
 block discarded – undo
4354 4357
      * Saves the given item
4355 4358
      * @param	integer	$item_id. Optional (will take from $_REQUEST if null)
4356 4359
      * @param	boolean	$from_outside Save from url params (true) or from current attributes (false). Optional. Defaults to true
4360
+     * @param integer $item_id
4357 4361
      * @return	boolean
4358 4362
      */
4359 4363
     public function save_item($item_id = null, $from_outside = true)
@@ -4851,7 +4855,7 @@  discard block
 block discarded – undo
4851 4855
 
4852 4856
     /**
4853 4857
      * Sets use_max_score
4854
-     * @param   string  $use_max_score Optional string giving the new location of this learnpath
4858
+     * @param   integer  $use_max_score Optional string giving the new location of this learnpath
4855 4859
      * @return  boolean True on success / False on error
4856 4860
      */
4857 4861
     public function set_use_max_score($use_max_score = 1)
@@ -5254,6 +5258,7 @@  discard block
 block discarded – undo
5254 5258
      * Register the attempt mode into db thanks to flags prevent_reinit and seriousgame_mode flags
5255 5259
      *
5256 5260
      * @param string 'seriousgame', 'single' or 'multiple'
5261
+     * @param string $mode
5257 5262
      * @return boolean
5258 5263
      * @author ndiechburg <[email protected]>
5259 5264
      **/
@@ -5296,7 +5301,7 @@  discard block
 block discarded – undo
5296 5301
     /**
5297 5302
      * Switch between multiple attempt, single attempt or serious_game mode (only for scorm)
5298 5303
      *
5299
-     * @return boolean
5304
+     * @return boolean|null
5300 5305
      * @author ndiechburg <[email protected]>
5301 5306
      **/
5302 5307
     public function switch_attempt_mode()
@@ -5487,7 +5492,6 @@  discard block
 block discarded – undo
5487 5492
     /**
5488 5493
      * Function that creates a html list of learning path items so that we can add audio files to them
5489 5494
      * @author Kevin Van Den Haute
5490
-     * @param int $lp_id
5491 5495
      * @return string
5492 5496
      */
5493 5497
     public function overview()
@@ -6501,7 +6505,7 @@  discard block
 block discarded – undo
6501 6505
     /**
6502 6506
      * Function that displays a list with al the resources that
6503 6507
      * could be added to the learning path
6504
-     * @return string
6508
+     * @return boolean
6505 6509
      */
6506 6510
     public function display_resources()
6507 6511
     {
@@ -10046,7 +10050,7 @@  discard block
 block discarded – undo
10046 10050
 
10047 10051
     /**
10048 10052
      * @param int $lp_id
10049
-     * @return bool
10053
+     * @return false|null
10050 10054
      */
10051 10055
     public function scorm_export_to_pdf($lp_id)
10052 10056
     {
@@ -10581,7 +10585,7 @@  discard block
 block discarded – undo
10581 10585
 
10582 10586
     /**
10583 10587
      * @param int $itemId
10584
-     * @return learnpathItem|false
10588
+     * @return string
10585 10589
      */
10586 10590
     public function getItem($itemId)
10587 10591
     {
@@ -10631,7 +10635,6 @@  discard block
 block discarded – undo
10631 10635
     /**
10632 10636
      * Set whether this is a learning path with the possibility to subscribe
10633 10637
      * users or not
10634
-     * @param int $subscribeUsers (0 = false, 1 = true)
10635 10638
      */
10636 10639
     public function setSubscribeUsers($value)
10637 10640
     {
@@ -10756,7 +10759,7 @@  discard block
 block discarded – undo
10756 10759
 
10757 10760
     /**
10758 10761
      * Get the item of exercise type (evaluation type)
10759
-     * @return array The final evaluation. Otherwise return false
10762
+     * @return integer The final evaluation. Otherwise return false
10760 10763
      */
10761 10764
     public function getFinalEvaluationItem()
10762 10765
     {
@@ -10980,7 +10983,7 @@  discard block
 block discarded – undo
10980 10983
     /**
10981 10984
      * Create a forum for this learning path
10982 10985
      * @param type $forumCategoryId
10983
-     * @return int The forum ID if was created. Otherwise return false
10986
+     * @return false|string The forum ID if was created. Otherwise return false
10984 10987
      */
10985 10988
     public function createForum($forumCategoryId)
10986 10989
     {
Please login to merge, or discard this patch.
main/inc/lib/myspace.lib.php 1 patch
Doc Comments   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -666,7 +666,6 @@  discard block
 block discarded – undo
666 666
      * @param   int $sessionId  The session ID
667 667
      * @param   int $courseId   The course ID
668 668
      * @param   int $exerciseId The quiz ID
669
-     * @param   int $answer Answer status (0 = incorrect, 1 = correct, 2 = both)
670 669
      * @return  string  HTML array of results formatted for gridJS
671 670
      * @author César Perales <[email protected]>, Beeznest Team
672 671
      */
@@ -1254,6 +1253,7 @@  discard block
 block discarded – undo
1254 1253
      * @param int Number of items to select
1255 1254
      * @param string Column to order on
1256 1255
      * @param string Order direction
1256
+     * @param integer $number_of_items
1257 1257
      * @return array Results
1258 1258
      */
1259 1259
     public static function get_course_data_tracking_overview($from, $number_of_items, $column, $direction)
@@ -1588,6 +1588,7 @@  discard block
 block discarded – undo
1588 1588
      * @param int Number of items to select
1589 1589
      * @param string Column to order on
1590 1590
      * @param string Order direction
1591
+     * @param integer $number_of_items
1591 1592
      * @return array Results
1592 1593
      */
1593 1594
     public static function get_session_data_tracking_overview($from, $number_of_items, $column, $direction)
@@ -1608,7 +1609,6 @@  discard block
 block discarded – undo
1608 1609
     /**
1609 1610
      * Fills in session reporting data
1610 1611
      *
1611
-     * @param integer $user_id the id of the user
1612 1612
      * @param array $url_params additonal url parameters
1613 1613
      * @param array $row the row information (the other columns)
1614 1614
      * @return string html code
@@ -2239,6 +2239,7 @@  discard block
 block discarded – undo
2239 2239
      * @author Patrick Cool <[email protected]>, Ghent University, Belgium
2240 2240
      * @version Dokeos 1.8.6
2241 2241
      * @since October 2008
2242
+     * @param integer $number_of_items
2242 2243
      */
2243 2244
     public static function get_user_data_tracking_overview($from, $number_of_items, $column, $direction)
2244 2245
     {
@@ -2341,7 +2342,6 @@  discard block
 block discarded – undo
2341 2342
     /**
2342 2343
      * Checks if there are repeted users in a given array
2343 2344
      * @param  array $usernames list of the usernames in the uploaded file
2344
-     * @param  array $user_array['username'] and $user_array['sufix'] where sufix is the number part in a login i.e -> jmontoya2
2345 2345
      * @return array with the $usernames array and the $user_array array
2346 2346
      * @author Julio Montoya Armas
2347 2347
      */
@@ -2516,6 +2516,7 @@  discard block
 block discarded – undo
2516 2516
 
2517 2517
     /**
2518 2518
      * Adds missing user-information (which isn't required, like password, etc).
2519
+     * @return integer
2519 2520
      */
2520 2521
     function complete_missing_data($user) {
2521 2522
         // 1. Generate a password if it is necessary.
Please login to merge, or discard this patch.
main/inc/lib/fileManage.lib.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
  * Deletes a file or a directory
40 40
  *
41 41
  * @author - Hugues Peeters
42
- * @param  $file (String) - the path of file or directory to delete
43
- * @return boolean - true if the delete succeed, false otherwise.
42
+ * @param  string $file (String) - the path of file or directory to delete
43
+ * @return boolean|null - true if the delete succeed, false otherwise.
44 44
  * @see    - delete() uses check_name_exist() and removeDir() functions
45 45
  */
46 46
 function my_delete($file)
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
  * @author Hugues Peeters <[email protected]>
128 128
  * @param  string $file_path complete path of the file or the directory
129 129
  * @param  string $new_file_name new name for the file or the directory
130
- * @return boolean true if succeed, false otherwise
130
+ * @return string|false true if succeed, false otherwise
131 131
  * @see rename() uses the check_name_exist() and php2phps() functions
132 132
  */
133 133
 function my_rename($file_path, $new_file_name) {
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
  * @param  string $target the path of the new area
175 175
  * @param  bool $forceMove Whether to force a move or to make a copy (safer but slower) and then delete the original
176 176
  * @param	bool $moveContent In some cases (including migrations), we need to move the *content* and not the folder itself
177
- * @return bool true if the move succeed, false otherwise.
177
+ * @return boolean|null true if the move succeed, false otherwise.
178 178
  * @see move() uses check_name_exist() and copyDirTo() functions
179 179
  */
180 180
 function move($source, $target, $forceMove = false, $moveContent = false)
Please login to merge, or discard this patch.
main/inc/lib/skill.lib.php 1 patch
Doc Comments   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -326,6 +326,7 @@  discard block
 block discarded – undo
326 326
 
327 327
     /**
328 328
      * Gets an element
329
+     * @param integer $gradebook_id
329 330
      */
330 331
     public function get_skill_info($skill_id, $gradebook_id)
331 332
     {
@@ -544,7 +545,7 @@  discard block
 block discarded – undo
544 545
      * Gets an element
545 546
      * @param int $id
546 547
      *
547
-     * @return array|mixed
548
+     * @return integer
548 549
      */
549 550
     public function get($id)
550 551
     {
@@ -885,7 +886,7 @@  discard block
 block discarded – undo
885 886
     /**
886 887
      * Get user's skills
887 888
      *
888
-     * @param int $userId User's id
889
+     * @param integer $user_id User's id
889 890
      * @param bool $get_skill_data
890 891
      */
891 892
     public function get_user_skills($user_id, $get_skill_data = false)
@@ -1090,7 +1091,7 @@  discard block
 block discarded – undo
1090 1091
      * @param bool return a flat array or not
1091 1092
      * @param int depth of the skills
1092 1093
      * @param bool filter status
1093
-     * @return json
1094
+     * @return string
1094 1095
      */
1095 1096
     public function get_skills_tree_json($user_id = null, $skill_id = null, $return_flat_array = false, $main_depth = 2, $filter_status = false)
1096 1097
     {
Please login to merge, or discard this patch.
main/inc/lib/system_announcements.lib.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -306,7 +306,7 @@
 block discarded – undo
306 306
      * @param int    Whether the announcement should be visible to anonymous users (1) or not (0)
307 307
      * @param string The language for which the announvement should be shown. Leave null for all langages
308 308
      * @param int    Whether to send an e-mail to all users (1) or not (0)
309
-     * @return mixed  insert_id on success, false on failure
309
+     * @return false|string  insert_id on success, false on failure
310 310
      */
311 311
     public static function add_announcement(
312 312
         $title,
Please login to merge, or discard this patch.
main/inc/lib/system/session.class.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,6 +14,9 @@  discard block
 block discarded – undo
14 14
 class Session implements \ArrayAccess
15 15
 {
16 16
 
17
+    /**
18
+     * @param string $variable
19
+     */
17 20
     static function read($variable, $default = null)
18 21
     {
19 22
         return isset($_SESSION[$variable]) ? $_SESSION[$variable] : $default;
@@ -39,7 +42,7 @@  discard block
 block discarded – undo
39 42
      * Returns true if session has variable set up, false otherwise.
40 43
      *
41 44
      * @param string $variable
42
-     * @return mixed value
45
+     * @return boolean value
43 46
      */
44 47
     static function has($variable)
45 48
     {
Please login to merge, or discard this patch.
main/exercise/export/exercise_import.inc.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -949,7 +949,6 @@
 block discarded – undo
949 949
 /**
950 950
  * Processes an IMS/QTI manifest file: store links to new files to be able to transform them into questions text
951 951
  * @param string $filePath The absolute filepath
952
- * @param array $links List of filepaths changes
953 952
  * @return bool
954 953
  */
955 954
 function qtiProcessManifest($filePath)
Please login to merge, or discard this patch.