Completed
Pull Request — 1.11.x (#1305)
by José
101:20 queued 63:48
created
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_array($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/AnnouncementManager.php 1 patch
Doc Comments   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
     }
19 19
 
20 20
     /**
21
-     * @return array
21
+     * @return string[]
22 22
      */
23 23
     public static function get_tags()
24 24
     {
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
      * @param string    $course_code
41 41
      * @param int       $session_id
42 42
      *
43
-     * @return mixed
43
+     * @return string
44 44
      */
45 45
     public static function parse_content($userId, $content, $course_code, $session_id = 0)
46 46
     {
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
      * @param array	    uploaded file $_FILES
350 350
      * @param string    Comment describing the attachment
351 351
      * @param bool  $sendToUsersInSession
352
-     * @return int      false on failure, ID of the announcement on success
352
+     * @return false|string      false on failure, ID of the announcement on success
353 353
      */
354 354
     public static function add_announcement(
355 355
         $emailTitle,
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
      * @param $to_users
461 461
      * @param array $file
462 462
      * @param string $file_comment
463
-     * @return bool|int
463
+     * @return false|string
464 464
      */
465 465
     public static function add_group_announcement(
466 466
         $emailTitle,
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
 
700 700
     /**
701 701
      * @param int $insert_id
702
-     * @return bool
702
+     * @return false|null
703 703
      */
704 704
     public static function update_mail_sent($insert_id)
705 705
     {
@@ -719,6 +719,7 @@  discard block
 block discarded – undo
719 719
      * Gets all announcements from a user by course
720 720
      * @param	string course db
721 721
      * @param	int user id
722
+     * @param integer $user_id
722 723
      * @return	array html with the content and count of announcements or false otherwise
723 724
      */
724 725
     public static function get_all_annoucement_by_user_course($course_code, $user_id)
@@ -1184,6 +1185,7 @@  discard block
 block discarded – undo
1184 1185
      * has been sent to
1185 1186
      * @param    string  The tool (announcement, agenda, ...)
1186 1187
      * @param    int     ID of the element of the corresponding type
1188
+     * @param string $tool
1187 1189
      * @return   array   Array of users and groups to whom the element has been sent
1188 1190
      */
1189 1191
     public static function sent_to($tool, $id)
@@ -1308,6 +1310,8 @@  discard block
 block discarded – undo
1308 1310
      * @param int attach id
1309 1311
      * @param array uploaded file $_FILES
1310 1312
      * @param string file comment
1313
+     * @param integer $id_attach
1314
+     * @param string $file_comment
1311 1315
      * @return int
1312 1316
      */
1313 1317
     public static function edit_announcement_attachment_file($id_attach, $file, $file_comment)
Please login to merge, or discard this patch.
main/inc/lib/diagnoser.lib.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -351,6 +351,12 @@
 block discarded – undo
351 351
 
352 352
     /**
353 353
      * Additional functions needed for fast integration
354
+     * @param integer $status
355
+     * @param string $section
356
+     * @param string $title
357
+     * @param string $url
358
+     * @param string|null $formatter
359
+     * @param string $comment
354 360
      */
355 361
     public function build_setting($status, $section, $title, $url, $current_value, $expected_value, $formatter, $comment, $img_path = null) {
356 362
         switch ($status) {
Please login to merge, or discard this patch.
Braces   +13 added lines, -9 removed lines patch added patch discarded remove patch
@@ -158,8 +158,9 @@  discard block
 block discarded – undo
158 158
         $array[] = $this->build_setting($status, '[INI]', 'display_errors', 'http://www.php.net/manual/en/ini.core.php#ini.display_errors', $setting, $req_setting, 'on_off', get_lang('DisplayErrorsInfo'));
159 159
 
160 160
         $setting = ini_get('default_charset');
161
-        if ($setting == '')
162
-            $setting = null;
161
+        if ($setting == '') {
162
+                    $setting = null;
163
+        }
163 164
         $req_setting = null;
164 165
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR;
165 166
         $array[] = $this->build_setting($status, '[INI]', 'default_charset', 'http://www.php.net/manual/en/ini.core.php#ini.default-charset', $setting, $req_setting, null, get_lang('DefaultCharsetInfo'));
@@ -177,22 +178,25 @@  discard block
 block discarded – undo
177 178
         $setting = ini_get('memory_limit');
178 179
         $req_setting = '>= '.REQUIRED_MIN_MEMORY_LIMIT.'M';
179 180
         $status = self :: STATUS_ERROR;
180
-        if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT)
181
-            $status = self :: STATUS_OK;
181
+        if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT) {
182
+                    $status = self :: STATUS_OK;
183
+        }
182 184
         $array[] = $this->build_setting($status, '[INI]', 'memory_limit', 'http://www.php.net/manual/en/ini.core.php#ini.memory-limit', $setting, $req_setting, null, get_lang('MemoryLimitInfo'));
183 185
 
184 186
         $setting = ini_get('post_max_size');
185 187
         $req_setting = '>= '.REQUIRED_MIN_POST_MAX_SIZE.'M';
186 188
         $status = self :: STATUS_ERROR;
187
-        if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE)
188
-            $status = self :: STATUS_OK;
189
+        if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE) {
190
+                    $status = self :: STATUS_OK;
191
+        }
189 192
         $array[] = $this->build_setting($status, '[INI]', 'post_max_size', 'http://www.php.net/manual/en/ini.core.php#ini.post-max-size', $setting, $req_setting, null, get_lang('PostMaxSizeInfo'));
190 193
 
191 194
         $setting = ini_get('upload_max_filesize');
192 195
         $req_setting = '>= '.REQUIRED_MIN_UPLOAD_MAX_FILESIZE.'M';
193 196
         $status = self :: STATUS_ERROR;
194
-        if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE)
195
-            $status = self :: STATUS_OK;
197
+        if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE) {
198
+                    $status = self :: STATUS_OK;
199
+        }
196 200
         $array[] = $this->build_setting($status, '[INI]', 'upload_max_filesize', 'http://www.php.net/manual/en/ini.core.php#ini.upload_max_filesize', $setting, $req_setting, null, get_lang('UploadMaxFilesizeInfo'));
197 201
 
198 202
         $setting = ini_get('variables_order');
@@ -205,7 +209,7 @@  discard block
 block discarded – undo
205 209
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
206 210
         $array[] = $this->build_setting($status, '[SESSION]', 'session.gc_maxlifetime', 'http://www.php.net/manual/en/ini.core.php#session.gc-maxlifetime', $setting, $req_setting, null, get_lang('SessionGCMaxLifetimeInfo'));
207 211
 
208
-        if (api_check_browscap()){$setting = true;}else{$setting=false;}
212
+        if (api_check_browscap()){$setting = true;} else{$setting=false;}
209 213
         $req_setting = true;
210 214
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
211 215
         $array[] = $this->build_setting($status, '[INI]', 'browscap', 'http://www.php.net/manual/en/misc.configuration.php#ini.browscap', $setting, $req_setting, 'on_off', get_lang('BrowscapInfo'));
Please login to merge, or discard this patch.
main/inc/lib/exercise.lib.php 1 patch
Doc Comments   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1255,6 +1255,7 @@  discard block
 block discarded – undo
1255 1255
 
1256 1256
     /**
1257 1257
      * Validates the time control key
1258
+     * @param integer $exercise_id
1258 1259
      */
1259 1260
     public static function exercise_time_control_is_valid(
1260 1261
         $exercise_id,
@@ -1388,7 +1389,7 @@  discard block
 block discarded – undo
1388 1389
      * @param int $in_direction
1389 1390
      * @param string $in_hotpot_path
1390 1391
      * @param bool $in_get_count
1391
-     * @param null $where_condition
1392
+     * @param string $where_condition
1392 1393
      * @return array|int
1393 1394
      */
1394 1395
     public static function get_exam_results_hotpotatoes_data(
@@ -2179,7 +2180,7 @@  discard block
 block discarded – undo
2179 2180
     /**
2180 2181
      * Return true if pass_pourcentage activated (we use the pass pourcentage feature
2181 2182
      * return false if pass_percentage = 0 (we don't use the pass pourcentage feature
2182
-     * @param $in_pass_pourcentage
2183
+     * @param string $in_pass_pourcentage
2183 2184
      * @return boolean
2184 2185
      * In this version, pass_percentage and show_success_message are disabled if
2185 2186
      * pass_percentage is set to 0
@@ -2192,7 +2193,7 @@  discard block
 block discarded – undo
2192 2193
     /**
2193 2194
      * Converts a numeric value in a percentage example 0.66666 to 66.67 %
2194 2195
      * @param $value
2195
-     * @return float Converted number
2196
+     * @return string Converted number
2196 2197
      */
2197 2198
     public static function convert_to_percentage($value)
2198 2199
     {
@@ -2208,7 +2209,7 @@  discard block
 block discarded – undo
2208 2209
      * @param   float $score
2209 2210
      * @param   float $weight
2210 2211
      * @deprecated seem not to be used
2211
-     * @return  float   the score rounded converted to the new range
2212
+     * @return  string|null   the score rounded converted to the new range
2212 2213
      */
2213 2214
     public static function convert_score($score, $weight)
2214 2215
     {
@@ -2759,6 +2760,7 @@  discard block
 block discarded – undo
2759 2760
      * @param    int        exercise id
2760 2761
      * @param    int    $courseId
2761 2762
      * @param    int        session id
2763
+     * @param integer $user_count
2762 2764
      * @return    float    Best average score
2763 2765
      */
2764 2766
     public static function get_best_average_score_by_exercise(
@@ -3198,8 +3200,9 @@  discard block
 block discarded – undo
3198 3200
     }
3199 3201
 
3200 3202
     /**
3201
-     * @param array $answer
3203
+     * @param string|null $answer
3202 3204
      * @param string $user_answer
3205
+     * @param string|null $current_answer
3203 3206
      * @return array
3204 3207
      */
3205 3208
     public static function check_fill_in_blanks($answer, $user_answer, $current_answer)
@@ -3805,7 +3808,7 @@  discard block
 block discarded – undo
3805 3808
 
3806 3809
     /**
3807 3810
      * @param int $countLetter
3808
-     * @return mixed
3811
+     * @return string
3809 3812
      */
3810 3813
     public static function detectInputAppropriateClass($countLetter)
3811 3814
     {
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Rule/MaxFileSize.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,6 @@
 block discarded – undo
9 9
 {
10 10
 	/**
11 11
 	 * @param $value array     Uploaded file info (from $_FILES)
12
-	 * @param null $options
13 12
 	 * @return bool
14 13
 	 */
15 14
 	public function validate($elementValue, $maxSize)
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Rule/MobilePhoneNumber.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
      *
17 17
      * @param string Mobile phone number to be validated
18 18
      * @param string Not using it. Just to respect the declaration
19
-     * @return boolean Returns true if valid, false otherwise.
19
+     * @return integer Returns true if valid, false otherwise.
20 20
      */
21 21
     function validate($mobilePhoneNumber, $options = null)
22 22
     {
Please login to merge, or discard this patch.
main/inc/lib/getid3/getid3.php 2 patches
Doc Comments   +22 added lines patch added patch discarded remove patch
@@ -456,6 +456,10 @@  discard block
 block discarded – undo
456 456
 
457 457
 
458 458
     // Add warning(s) to $this->warnings[]
459
+
460
+    /**
461
+     * @param string $message
462
+     */
459 463
     public function warning($message) {
460 464
 
461 465
         if (is_array($message)) {
@@ -482,6 +486,11 @@  discard block
 block discarded – undo
482 486
 
483 487
 
484 488
     // Convert string between charsets -- iconv() wrapper
489
+
490
+    /**
491
+     * @param string $out_charset
492
+     * @param string $string
493
+     */
485 494
     public function iconv($in_charset, $out_charset, $string, $drop01 = false) {
486 495
 
487 496
         if ($drop01 && ($string === "\x00" || $string === "\x01")) {
@@ -509,6 +518,9 @@  discard block
 block discarded – undo
509 518
 
510 519
 
511 520
 
521
+    /**
522
+     * @param string $name
523
+     */
512 524
     public function include_module($name) {
513 525
 
514 526
         if (!file_exists($this->include_path.'module.'.$name.'.php')) {
@@ -1342,6 +1354,10 @@  discard block
 block discarded – undo
1342 1354
 
1343 1355
 
1344 1356
     // Convert Big Endian byte string to int - max 32 bits
1357
+
1358
+    /**
1359
+     * @param string $byte_word
1360
+     */
1345 1361
     public static function BigEndian2Int($byte_word, $signed = false) {
1346 1362
 
1347 1363
         $int_value = 0;
@@ -1391,6 +1407,9 @@  discard block
 block discarded – undo
1391 1407
 
1392 1408
 
1393 1409
 
1410
+    /**
1411
+     * @param string $byte_word
1412
+     */
1394 1413
     public static function BigEndian2Float($byte_word) {
1395 1414
 
1396 1415
 		// ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic
@@ -1478,6 +1497,9 @@  discard block
 block discarded – undo
1478 1497
 
1479 1498
 
1480 1499
 
1500
+	/**
1501
+	 * @param string $binary_numerator
1502
+	 */
1481 1503
 	public static function DecimalBinary2Float($binary_numerator) {
1482 1504
 		$numerator   = bindec($binary_numerator);
1483 1505
 		$denominator = bindec('1'.str_repeat('0', strlen($binary_numerator)));
Please login to merge, or discard this patch.
Braces   +8 added lines, -17 removed lines patch added patch discarded remove patch
@@ -198,8 +198,7 @@  discard block
 block discarded – undo
198 198
                     $tag_class = 'getid3_' . $tag_name;
199 199
                     $tag = new $tag_class($this);
200 200
                     $tag->Analyze();
201
-                }
202
-                catch (getid3_exception $e) {
201
+                } catch (getid3_exception $e) {
203 202
                     throw $e;
204 203
                 }
205 204
             }
@@ -243,9 +242,7 @@  discard block
 block discarded – undo
243 242
             // use assume format on these if format detection failed
244 243
             if (preg_match('/\.mp[123a]$/i', $filename)) {
245 244
                 $determined_format = $file_format_array['mp3'];
246
-            }
247
-
248
-            else {
245
+            } else {
249 246
                 fclose($this->fp);
250 247
                 throw new getid3_exception('Unable to determine file format');
251 248
             }
@@ -259,8 +256,7 @@  discard block
 block discarded – undo
259 256
             if ($determined_format['fail_id3'] === 'ERROR') {
260 257
                 fclose($this->fp);
261 258
                 throw new getid3_exception('ID3 tags not allowed on this file type.');
262
-            }
263
-            elseif ($determined_format['fail_id3'] === 'WARNING') {
259
+            } elseif ($determined_format['fail_id3'] === 'WARNING') {
264 260
                 @$this->info['id3v1'] and $this->warning('ID3v1 tags not allowed on this file type.');
265 261
                 @$this->info['id3v2'] and $this->warning('ID3v2 tags not allowed on this file type.');
266 262
             }
@@ -301,11 +297,9 @@  discard block
 block discarded – undo
301 297
 
302 298
         try {
303 299
              $this->option_analyze and $class->Analyze();
304
-            }
305
-        catch (getid3_exception $e) {
300
+            } catch (getid3_exception $e) {
306 301
             throw $e;
307
-        }
308
-        catch (Exception $e) {
302
+        } catch (Exception $e) {
309 303
             throw new getid3_exception('Corrupt file.');
310 304
         }
311 305
 
@@ -460,8 +454,7 @@  discard block
 block discarded – undo
460 454
 
461 455
         if (is_array($message)) {
462 456
             $this->warnings = array_merge($this->warnings, $message);
463
-        }
464
-        else {
457
+        } else {
465 458
             $this->warnings[] = $message;
466 459
         }
467 460
     }
@@ -1101,8 +1094,7 @@  discard block
 block discarded – undo
1101 1094
                             if (empty($this->info['comments'][$tag_name])) {
1102 1095
 
1103 1096
                                 // fall through and append value
1104
-                            }
1105
-                            elseif ($tag_type == 'id3v1') {
1097
+                            } elseif ($tag_type == 'id3v1') {
1106 1098
 
1107 1099
                                 $new_value_length = strlen(trim($value));
1108 1100
                                 foreach ($this->info['comments'][$tag_name] as $existing_key => $existing_value) {
@@ -1112,8 +1104,7 @@  discard block
 block discarded – undo
1112 1104
                                         break 2;
1113 1105
                                     }
1114 1106
                                 }
1115
-                            }
1116
-                            else {
1107
+                            } else {
1117 1108
 
1118 1109
                                 $new_value_length = strlen(trim($value));
1119 1110
                                 foreach ($this->info['comments'][$tag_name] as $existing_key => $existing_value) {
Please login to merge, or discard this patch.