Completed
Push — 1.10.x ( 1567b9...eba9e5 )
by Julito
81:35 queued 25:27
created
main/auth/sso/sso.class.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 
81 81
     /**
82 82
      * Validates the received active connection data with the database
83
-     * @return	bool	Return the loginFailed variable value to local.inc.php
83
+     * @return	null|false	Return the loginFailed variable value to local.inc.php
84 84
      */
85 85
     public function check_user()
86 86
     {
Please login to merge, or discard this patch.
main/coursecopy/classes/CourseArchiver.class.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -173,7 +173,7 @@
 block discarded – undo
173 173
 
174 174
     /**
175 175
      * @param array $file
176
-     * @return bool|string
176
+     * @return string|false
177 177
      */
178 178
     public static function import_uploaded_file($file)
179 179
     {
Please login to merge, or discard this patch.
main/coursecopy/classes/CourseRecycler.class.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
      * course
35 35
      * @param string $type 'full_backup' or 'select_items'
36 36
      *
37
-     * @return bool
37
+     * @return false|null
38 38
      *
39 39
      * @assert (null) === false
40 40
      */
Please login to merge, or discard this patch.
main/coursecopy/copy_course_session.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -47,6 +47,9 @@
 block discarded – undo
47 47
 
48 48
 /* FUNCTIONS */
49 49
 
50
+/**
51
+ * @param string $name
52
+ */
50 53
 function make_select_session_list($name, $sessions, $attr = array())
51 54
 {
52 55
     $attributes = '';
Please login to merge, or discard this patch.
main/document/downloadfolder.inc.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -327,7 +327,7 @@
 block discarded – undo
327 327
  * @param array $arr1 first array
328 328
  * @param array $arr2 second array
329 329
  *
330
- * @return array difference between the two arrays
330
+ * @return string difference between the two arrays
331 331
  */
332 332
 function diff($arr1, $arr2)
333 333
 {
Please login to merge, or discard this patch.
main/gradebook/lib/be/learnpathlink.class.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
 
96 96
 	/**
97 97
 	 * Get the progress of this learnpath. Only the last attempt are taken into account.
98
-	 * @param $stud_id student id (default: all students who have results - then the average is returned)
98
+	 * @param integer $stud_id student id (default: all students who have results - then the average is returned)
99 99
 	 * @return	array (score, max) if student is given
100 100
 	 * 			array (sum of scores, number of scores) otherwise
101 101
 	 * 			or null if no scores available
Please login to merge, or discard this patch.
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,8 +29,9 @@  discard block
 block discarded – undo
29 29
 	public function get_not_created_links()
30 30
 	{
31 31
 		return false;
32
-		if (empty($this->course_code))
33
-			die('Error in get_not_created_links() : course code not set');
32
+		if (empty($this->course_code)) {
33
+					die('Error in get_not_created_links() : course code not set');
34
+		}
34 35
 
35 36
 		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
36 37
 
@@ -57,8 +58,9 @@  discard block
 block discarded – undo
57 58
 	 */
58 59
 	public function get_all_links()
59 60
 	{
60
-		if (empty($this->course_code))
61
-			die('Error in get_not_created_links() : course code not set');
61
+		if (empty($this->course_code)) {
62
+					die('Error in get_not_created_links() : course code not set');
63
+		}
62 64
 
63 65
 		$session_id = api_get_session_id();
64 66
 		if (empty($session_id)) {
@@ -111,8 +113,9 @@  discard block
 block discarded – undo
111 113
                     lp_id = ".$this->get_ref_id()." AND
112 114
                     session_id = $session_id ";
113 115
 
114
-		if (isset($stud_id))
115
-			$sql .= ' AND user_id = '.intval($stud_id);
116
+		if (isset($stud_id)) {
117
+					$sql .= ' AND user_id = '.intval($stud_id);
118
+		}
116 119
 
117 120
 		// order by id, that way the student's first attempt is accessed first
118 121
 		$sql .= ' ORDER BY view_count DESC';
@@ -122,8 +125,9 @@  discard block
 block discarded – undo
122 125
 		if (isset($stud_id)) {
123 126
 			if ($data = Database::fetch_assoc($scores)) {
124 127
 				return array ($data['progress'], 100);
125
-			} else
126
-				return null;
128
+			} else {
129
+							return null;
130
+			}
127 131
 		} else {
128 132
 			// all students -> get average
129 133
 			$students = array();  // user list, needed to make sure we only
Please login to merge, or discard this patch.
main/gradebook/lib/fe/gradebooktable.class.php 2 patches
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,6 +32,8 @@  discard block
 block discarded – undo
32 32
      * @param array $evals
33 33
      * @param array $links
34 34
      * @param null $addparams
35
+     * @param boolean $showTeacherView
36
+     * @param integer $userId
35 37
      */
36 38
     public function __construct(
37 39
         $currentcat,
@@ -895,7 +897,7 @@  discard block
 block discarded – undo
895 897
 
896 898
     /**
897 899
      * @param $item
898
-     * @return mixed
900
+     * @return string|null
899 901
      */
900 902
     private function build_course_code($item)
901 903
     {
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -256,10 +256,11 @@
 block discarded – undo
256 256
         }
257 257
 
258 258
         // Categories.
259
-        if (!empty($data_array))
260
-        foreach ($data_array as $data) {
259
+        if (!empty($data_array)) {
260
+                foreach ($data_array as $data) {
261 261
             // list of items inside the gradebook (exercises, lps, forums, etc)
262 262
             $row  = array();
263
+        }
263 264
             /** @var AbstractLink $item */
264 265
             $item = $mainCategory = $data[0];
265 266
 
Please login to merge, or discard this patch.
main/gradebook/lib/user_data_generator.class.php 2 patches
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,6 +72,7 @@  discard block
 block discarded – undo
72 72
 
73 73
 	/**
74 74
 	 * Get actual array data
75
+	 * @param integer $count
75 76
 	 * @return array 2-dimensional array - each array contains the elements:
76 77
 	 * 0: eval/link object
77 78
 	 * 1: item name
@@ -285,7 +286,7 @@  discard block
 block discarded – undo
285 286
 
286 287
 	/**
287 288
 	 * @param $item
288
-	 * @param $ignore_score_color
289
+	 * @param boolean $ignore_score_color
289 290
 	 * @return string
290 291
 	 */
291 292
 	private function build_average_column($item, $ignore_score_color)
@@ -306,7 +307,7 @@  discard block
 block discarded – undo
306 307
 
307 308
 	/**
308 309
 	 * @param $item
309
-	 * @param $ignore_score_color
310
+	 * @param boolean $ignore_score_color
310 311
 	 * @return string
311 312
 	 */
312 313
 	private function build_result_column($item, $ignore_score_color)
@@ -323,7 +324,7 @@  discard block
 block discarded – undo
323 324
 
324 325
 	/**
325 326
 	 * @param $item
326
-	 * @param $ignore_score_color
327
+	 * @param boolean $ignore_score_color
327 328
 	 * @return string
328 329
 	 */
329 330
 	private function build_mask_column($item, $ignore_score_color)
@@ -339,7 +340,7 @@  discard block
 block discarded – undo
339 340
 
340 341
 	/**
341 342
 	 * @param $coursecode
342
-	 * @return mixed
343
+	 * @return string
343 344
 	 */
344 345
 	private function get_course_name_from_code_cached($coursecode)
345 346
 	{
Please login to merge, or discard this patch.
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 		// sort users array
96 96
 		if ($sorting & self :: UDG_SORT_TYPE) {
97 97
 			usort($allitems, array('UserDataGenerator', 'sort_by_type'));
98
-		}elseif ($sorting & self :: UDG_SORT_NAME) {
98
+		} elseif ($sorting & self :: UDG_SORT_NAME) {
99 99
 			usort($allitems, array('UserDataGenerator', 'sort_by_name'));
100 100
 		} elseif ($sorting & self :: UDG_SORT_COURSE) {
101 101
 			usort($allitems, array('UserDataGenerator', 'sort_by_course'));
@@ -148,8 +148,9 @@  discard block
 block discarded – undo
148 148
 			$row[] = $this->build_category_name($item);
149 149
 			$row[] = $this->build_average_column($item, $ignore_score_color);
150 150
 			$row[] = $this->build_result_column($item, $ignore_score_color);
151
-			if ($scoredisplay->is_custom())
152
-				$row[] = $this->build_mask_column($item, $ignore_score_color);
151
+			if ($scoredisplay->is_custom()) {
152
+							$row[] = $this->build_mask_column($item, $ignore_score_color);
153
+			}
153 154
 			$data[] = $row;
154 155
 		}
155 156
 		return $data;
@@ -362,13 +363,14 @@  discard block
 block discarded – undo
362 363
 		if (isset ($this->categorycache)
363 364
 			&& isset ($this->categorycache[$category_id])) {
364 365
 			return $this->categorycache[$category_id];
365
-		}else {
366
+		} else {
366 367
 			$cat = Category::load($category_id);
367 368
 			if (isset($cat)){
368 369
 				$this->categorycache[$category_id] = $cat[0];
369 370
 				return $cat[0];
370
-			}else
371
-				return null;
371
+			} else {
372
+							return null;
373
+			}
372 374
 		}
373 375
 	}
374 376
 
Please login to merge, or discard this patch.
main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
      * Search sessions by name, based on a search string
25 25
      * @param string Search string
26 26
      * @param int Deprecated param
27
-     * @return string Xajax response block
27
+     * @return xajaxResponse Xajax response block
28 28
      * @assert () === false
29 29
      */
30 30
     function search_sessions($needle, $id)
Please login to merge, or discard this patch.