Completed
Branch master (d7c4e6)
by
unknown
29:20
created
includes/db/Database.php 1 patch
Doc Comments   +15 added lines, -5 removed lines patch added patch discarded remove patch
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
 	}
675 675
 
676 676
 	/**
677
-	 * @return bool|string
677
+	 * @return string|false
678 678
 	 */
679 679
 	protected function restoreErrorHandler() {
680 680
 		restore_error_handler();
@@ -904,6 +904,12 @@  discard block
 block discarded – undo
904 904
 		return $res;
905 905
 	}
906 906
 
907
+	/**
908
+	 * @param string $sql
909
+	 * @param string $commentedSql
910
+	 * @param boolean $isWrite
911
+	 * @param string $fname
912
+	 */
907 913
 	private function doProfiledQuery( $sql, $commentedSql, $isWrite, $fname ) {
908 914
 		$isMaster = !is_null( $this->getLBInfo( 'master' ) );
909 915
 		# generalizeSQL() will probably cut down the query to reasonable
@@ -944,6 +950,10 @@  discard block
 block discarded – undo
944 950
 		return $ret;
945 951
 	}
946 952
 
953
+	/**
954
+	 * @param string $sql
955
+	 * @param boolean $priorWritesPending
956
+	 */
947 957
 	private function canRecoverFromDisconnect( $sql, $priorWritesPending ) {
948 958
 		# Transaction dropped; this can mean lost writes, or REPEATABLE-READ snapshots.
949 959
 		# Dropped connections also mean that named locks are automatically released.
@@ -1164,7 +1174,7 @@  discard block
 block discarded – undo
1164 1174
 	 *
1165 1175
 	 * @param array $options Associative array of options to be turned into
1166 1176
 	 *   an SQL query, valid keys are listed in the function.
1167
-	 * @return array
1177
+	 * @return string[]
1168 1178
 	 * @see DatabaseBase::select()
1169 1179
 	 */
1170 1180
 	public function makeSelectOptions( $options ) {
@@ -3075,8 +3085,8 @@  discard block
 block discarded – undo
3075 3085
 	 * on object's error ignore settings).
3076 3086
 	 *
3077 3087
 	 * @param string $filename File name to open
3078
-	 * @param bool|callable $lineCallback Optional function called before reading each line
3079
-	 * @param bool|callable $resultCallback Optional function called for each MySQL result
3088
+	 * @param boolean $lineCallback Optional function called before reading each line
3089
+	 * @param boolean $resultCallback Optional function called for each MySQL result
3080 3090
 	 * @param bool|string $fname Calling function name or false if name should be
3081 3091
 	 *   generated dynamically using $filename
3082 3092
 	 * @param bool|callable $inputCallback Optional function called for each
@@ -3423,7 +3433,7 @@  discard block
 block discarded – undo
3423 3433
 	}
3424 3434
 
3425 3435
 	/**
3426
-	 * @return string|bool Reason this DB is read-only or false if it is not
3436
+	 * @return string|false Reason this DB is read-only or false if it is not
3427 3437
 	 */
3428 3438
 	protected function getReadOnlyReason() {
3429 3439
 		$reason = $this->getLBInfo( 'readOnlyReason' );
Please login to merge, or discard this patch.
includes/specialpage/LoginSignupSpecialPage.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,6 +81,9 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	abstract protected function logAuthResult( $success, $status = null );
83 83
 
84
+	/**
85
+	 * @param string $name
86
+	 */
84 87
 	public function __construct( $name ) {
85 88
 		global $wgUseMediaWikiUIEverywhere;
86 89
 		parent::__construct( $name );
@@ -365,7 +368,7 @@  discard block
 block discarded – undo
365 368
 	 * Show the success page.
366 369
 	 *
367 370
 	 * @param string $type Condition of return to; see `executeReturnTo`
368
-	 * @param string|Message $title Page's title
371
+	 * @param Message $title Page's title
369 372
 	 * @param string $msgname
370 373
 	 * @param string $injected_html
371 374
 	 * @param StatusValue|null $extraMessages
@@ -414,7 +417,6 @@  discard block
 block discarded – undo
414 417
 	/**
415 418
 	 * Replace some globals to make sure the fact that the user has just been logged in is
416 419
 	 * reflected in the current request.
417
-	 * @param User $user
418 420
 	 */
419 421
 	protected function setSessionUserForCurrentRequest() {
420 422
 		global $wgUser, $wgLang;
@@ -1254,6 +1256,7 @@  discard block
 block discarded – undo
1254 1256
 
1255 1257
 	/**
1256 1258
 	 * @param array $formDescriptor
1259
+	 * @param AuthenticationRequest[] $requests
1257 1260
 	 */
1258 1261
 	protected function postProcessFormDescriptor( &$formDescriptor, $requests ) {
1259 1262
 		// Pre-fill username (if not creating an account, T46775).
Please login to merge, or discard this patch.