Completed
Pull Request — 1.11.x (#1599)
by José
28:19
created
main/gradebook/lib/be/category.class.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1545,7 +1545,7 @@
 block discarded – undo
1545 1545
      * Retrieve all categories inside a course independent category
1546 1546
      * that should be visible to a student.
1547 1547
      * @param integer $cat_id parent category
1548
-     * @param $stud_id student id
1548
+     * @param integer $stud_id student id
1549 1549
      * @param $cats optional: if defined, the categories will be added to this array
1550 1550
      */
1551 1551
     public function get_independent_categories_with_result_for_student($cat_id, $stud_id, $cats = array())
Please login to merge, or discard this patch.
main/gradebook/lib/be/evaluation.class.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -273,7 +273,7 @@
 block discarded – undo
273 273
 
274 274
 
275 275
 	/**
276
-	 * @param array $result
276
+	 * @param Doctrine\DBAL\Driver\Statement|null $result
277 277
 	 * @return array
278 278
 	 */
279 279
 	private static function create_evaluation_objects_from_sql_result($result)
Please login to merge, or discard this patch.
main/inc/lib/exercise_show_functions.lib.php 1 patch
Doc Comments   +36 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,6 +25,7 @@  discard block
 block discarded – undo
25 25
 	 * @param int $questionId      Question ID
26 26
      * @param int $resultsDisabled
27 27
      * @param string $originalStudentAnswer
28
+     * @param boolean $showTotalScoreAndUserChoices
28 29
      *
29 30
 	 * @return void
30 31
 	 */
@@ -71,6 +72,11 @@  discard block
 block discarded – undo
71 72
      * @param string    Answer text
72 73
      * @param int       Exercise ID
73 74
      * @param int       Question ID
75
+     * @param integer $feedback_type
76
+     * @param string $answer
77
+     * @param integer $id
78
+     * @param integer $questionId
79
+     * @param boolean|string $showTotalScoreAndUserChoices
74 80
      * @return void
75 81
      */
76 82
     public static function display_calculated_answer(
@@ -110,6 +116,9 @@  discard block
 block discarded – undo
110 116
 	 * @param string    Answer text
111 117
 	 * @param int       Exercise ID
112 118
 	 * @param int       Question ID
119
+	 * @param integer $feedback_type
120
+	 * @param integer $exe_id
121
+	 * @param integer $questionId
113 122
 	 * @return void
114 123
 	 */
115 124
 	public static function display_free_answer(
@@ -139,11 +148,10 @@  discard block
 block discarded – undo
139 148
 	}
140 149
 
141 150
     /**
142
-    * @param $feedback_type
151
+    * @param integer $feedback_type
143 152
     * @param $answer
144
-    * @param $id
145
-    * @param $questionId
146
-    * @param null $nano
153
+    * @param integer $id
154
+    * @param integer $questionId
147 155
     * @param int $results_disabled
148 156
      */
149 157
 	public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
@@ -193,6 +201,7 @@  discard block
 block discarded – undo
193 201
      * @param string $answerComment
194 202
      * @param int $resultsDisabled
195 203
      * @param int $orderColor
204
+     * @param boolean $showTotalScoreAndUserChoices
196 205
      */
197 206
 	public static function display_hotspot_answer(
198 207
         $feedback_type,
@@ -277,6 +286,13 @@  discard block
 block discarded – undo
277 286
 	 * @param integer Exercise ID
278 287
 	 * @param integer Question ID
279 288
 	 * @param boolean Whether to show the answer comment or not
289
+	 * @param integer $answerType
290
+	 * @param string $answer
291
+	 * @param string $answerComment
292
+	 * @param integer $answerCorrect
293
+	 * @param integer $id
294
+	 * @param integer $questionId
295
+	 * @param boolean $showTotalScoreAndUserChoices
280 296
 	 * @return void
281 297
 	 */
282 298
 	public static function display_unique_or_multiple_answer(
@@ -373,6 +389,14 @@  discard block
 block discarded – undo
373 389
      * @param integer Exercise ID
374 390
      * @param integer Question ID
375 391
      * @param boolean Whether to show the answer comment or not
392
+     * @param integer $feedback_type
393
+     * @param integer $answerType
394
+     * @param string $answer
395
+     * @param string $answerComment
396
+     * @param integer $answerCorrect
397
+     * @param integer $id
398
+     * @param integer $questionId
399
+     * @param boolean $showTotalScoreAndUserChoices
376 400
      * @return void
377 401
      */
378 402
     public static function display_multiple_answer_true_false(
@@ -477,6 +501,14 @@  discard block
 block discarded – undo
477 501
      * @param integer Exercise ID
478 502
      * @param integer Question ID
479 503
      * @param boolean Whether to show the answer comment or not
504
+     * @param integer $feedback_type
505
+     * @param integer $answerType
506
+     * @param string $answer
507
+     * @param string $answerComment
508
+     * @param integer $answerCorrect
509
+     * @param integer $id
510
+     * @param integer $questionId
511
+     * @param boolean $showTotalScoreAndUserChoices
480 512
      * @return void
481 513
      */
482 514
     public static function display_multiple_answer_combination_true_false(
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/Message.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -314,7 +314,7 @@
 block discarded – undo
314 314
      * Set votes
315 315
      *
316 316
      * @param integer $votes
317
-     * @return integer
317
+     * @return Message
318 318
      */
319 319
     public function setVotes($votes)
320 320
     {
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/Filesystem/Data.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 
117 117
     /**
118 118
      * Create folders
119
-     * @param array            $folderList
119
+     * @param string[]            $folderList
120 120
      * @param OutputInterface  $output
121 121
      * @param string           $folderPermissions
122 122
      */
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
      * http://chamilo/courses/ABC/document/file.jpg
201 201
      * @param string $content
202 202
      *
203
-     * @return string
203
+     * @return \simplehtmldom_1_5\simple_html_dom
204 204
      */
205 205
     public function convertRelativeToAbsoluteUrl($content)
206 206
     {
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/SkillRelUser.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 
198 198
     /**
199 199
      * Get user
200
-     * @return \User
200
+     * @return User
201 201
      */
202 202
     public function getUser()
203 203
     {
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 
513 513
     /**
514 514
      * Calculate the average value from the feedback comments
515
-     * @return int
515
+     * @return string
516 516
      */
517 517
     public function getAverage()
518 518
     {
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/SkillRelUserComment.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@
 block discarded – undo
114 114
 
115 115
     /**
116 116
      * Get feedbackDateTime
117
-     * @return type
117
+     * @return \DateTime
118 118
      */
119 119
     public function getFeedbackDateTime()
120 120
     {
Please login to merge, or discard this patch.
main/admin/course_import.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@
 block discarded – undo
151 151
 /**
152 152
  * Read the CSV-file
153 153
  * @param string $file Path to the CSV-file
154
- * @return array All course-information read from the file
154
+ * @return Ddeboer\DataImport\Reader\CsvReader All course-information read from the file
155 155
  */
156 156
 function parse_csv_data($file)
157 157
 {
Please login to merge, or discard this patch.
main/inc/lib/export.lib.inc.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
      * @param array $data
39 39
      * @param string $filename
40 40
      *
41
-     * @return mixed csv file | false if no data to export
41
+     * @return false|null csv file | false if no data to export
42 42
      */
43 43
     public static function arrayToCsv($data, $filename = 'export')
44 44
     {
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
      * @param string Name of common tag to place each line in
161 161
      * @param string Name of the root element. A root element should always be given.
162 162
      * @param string Encoding in which the data is provided
163
-     * @return void  Prompts the user for a file download
163
+     * @return boolean  Prompts the user for a file download
164 164
      */
165 165
     public static function export_complex_table_xml(
166 166
         $data,
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
      * @param string $name
287 287
      * @param string $format
288 288
      *
289
-     * @return bool
289
+     * @return false|null
290 290
      */
291 291
     public static function htmlToOdt($html, $name, $format = 'odt')
292 292
     {
Please login to merge, or discard this patch.