@@ -81,6 +81,9 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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; |
@@ -1181,7 +1181,7 @@ discard block |
||
| 1181 | 1181 | /** |
| 1182 | 1182 | * Load user data from the session. |
| 1183 | 1183 | * |
| 1184 | - * @return bool True if the user is logged in, false otherwise. |
|
| 1184 | + * @return null|boolean True if the user is logged in, false otherwise. |
|
| 1185 | 1185 | */ |
| 1186 | 1186 | private function loadFromSession() { |
| 1187 | 1187 | // Deprecated hook |
@@ -2855,7 +2855,7 @@ discard block |
||
| 2855 | 2855 | * resetting it if it's empty (and saving changes). |
| 2856 | 2856 | * |
| 2857 | 2857 | * @param string $oname The option name to retrieve the token from |
| 2858 | - * @return string|bool User's current value for the option, or false if this option is disabled. |
|
| 2858 | + * @return false|string User's current value for the option, or false if this option is disabled. |
|
| 2859 | 2859 | * @see resetTokenFromOption() |
| 2860 | 2860 | * @see getOption() |
| 2861 | 2861 | * @deprecated since 1.26 Applications should use the OAuth extension |
@@ -2884,7 +2884,7 @@ discard block |
||
| 2884 | 2884 | * *Does not* save user's preferences (similarly to setOption()). |
| 2885 | 2885 | * |
| 2886 | 2886 | * @param string $oname The option name to reset the token in |
| 2887 | - * @return string|bool New token value, or false if this option is disabled. |
|
| 2887 | + * @return false|string New token value, or false if this option is disabled. |
|
| 2888 | 2888 | * @see getTokenFromOption() |
| 2889 | 2889 | * @see setOption() |
| 2890 | 2890 | */ |
@@ -2920,7 +2920,7 @@ discard block |
||
| 2920 | 2920 | * new option kind is added. |
| 2921 | 2921 | * |
| 2922 | 2922 | * @see User::getOptionKinds |
| 2923 | - * @return array Option kinds |
|
| 2923 | + * @return string[] Option kinds |
|
| 2924 | 2924 | */ |
| 2925 | 2925 | public static function listOptionKinds() { |
| 2926 | 2926 | return [ |
@@ -4474,7 +4474,7 @@ discard block |
||
| 4474 | 4474 | /** |
| 4475 | 4475 | * Get the timestamp of account creation. |
| 4476 | 4476 | * |
| 4477 | - * @return string|bool|null Timestamp of account creation, false for |
|
| 4477 | + * @return false|string Timestamp of account creation, false for |
|
| 4478 | 4478 | * non-existent/anonymous user accounts, or null if existing account |
| 4479 | 4479 | * but information is not in database. |
| 4480 | 4480 | */ |
@@ -4489,7 +4489,7 @@ discard block |
||
| 4489 | 4489 | /** |
| 4490 | 4490 | * Get the timestamp of the first edit |
| 4491 | 4491 | * |
| 4492 | - * @return string|bool Timestamp of first edit, or false for |
|
| 4492 | + * @return false|string Timestamp of first edit, or false for |
|
| 4493 | 4493 | * non-existent/anonymous user accounts. |
| 4494 | 4494 | */ |
| 4495 | 4495 | public function getFirstEditTimestamp() { |
@@ -5259,7 +5259,7 @@ discard block |
||
| 5259 | 5259 | /** |
| 5260 | 5260 | * Return the list of user fields that should be selected to create |
| 5261 | 5261 | * a new user object. |
| 5262 | - * @return array |
|
| 5262 | + * @return string[] |
|
| 5263 | 5263 | */ |
| 5264 | 5264 | public static function selectFields() { |
| 5265 | 5265 | return [ |
@@ -663,7 +663,7 @@ |
||
| 663 | 663 | * Handles a stash exception, giving a useful error to the user. |
| 664 | 664 | * @param string $exceptionType Class name of the exception we encountered. |
| 665 | 665 | * @param string $message Message of the exception we encountered. |
| 666 | - * @return array Array of message and code, suitable for passing to dieUsage() |
|
| 666 | + * @return string[] Array of message and code, suitable for passing to dieUsage() |
|
| 667 | 667 | */ |
| 668 | 668 | protected function handleStashException( $exceptionType, $message ) { |
| 669 | 669 | switch ( $exceptionType ) { |
@@ -653,7 +653,7 @@ discard block |
||
| 653 | 653 | } |
| 654 | 654 | |
| 655 | 655 | /** |
| 656 | - * @return bool|string |
|
| 656 | + * @return string|false |
|
| 657 | 657 | */ |
| 658 | 658 | protected function restoreErrorHandler() { |
| 659 | 659 | restore_error_handler(); |
@@ -925,6 +925,10 @@ discard block |
||
| 925 | 925 | return $res; |
| 926 | 926 | } |
| 927 | 927 | |
| 928 | + /** |
|
| 929 | + * @param string $sql |
|
| 930 | + * @param boolean $priorWritesPending |
|
| 931 | + */ |
|
| 928 | 932 | private function canRecoverFromDisconnect( $sql, $priorWritesPending ) { |
| 929 | 933 | # Transaction dropped; this can mean lost writes, or REPEATABLE-READ snapshots. |
| 930 | 934 | # Dropped connections also mean that named locks are automatically released. |
@@ -1145,7 +1149,7 @@ discard block |
||
| 1145 | 1149 | * |
| 1146 | 1150 | * @param array $options Associative array of options to be turned into |
| 1147 | 1151 | * an SQL query, valid keys are listed in the function. |
| 1148 | - * @return array |
|
| 1152 | + * @return string[] |
|
| 1149 | 1153 | * @see DatabaseBase::select() |
| 1150 | 1154 | */ |
| 1151 | 1155 | public function makeSelectOptions( $options ) { |
@@ -3060,8 +3064,8 @@ discard block |
||
| 3060 | 3064 | * on object's error ignore settings). |
| 3061 | 3065 | * |
| 3062 | 3066 | * @param string $filename File name to open |
| 3063 | - * @param bool|callable $lineCallback Optional function called before reading each line |
|
| 3064 | - * @param bool|callable $resultCallback Optional function called for each MySQL result |
|
| 3067 | + * @param boolean $lineCallback Optional function called before reading each line |
|
| 3068 | + * @param boolean $resultCallback Optional function called for each MySQL result |
|
| 3065 | 3069 | * @param bool|string $fname Calling function name or false if name should be |
| 3066 | 3070 | * generated dynamically using $filename |
| 3067 | 3071 | * @param bool|callable $inputCallback Optional function called for each |
@@ -3392,7 +3396,7 @@ discard block |
||
| 3392 | 3396 | } |
| 3393 | 3397 | |
| 3394 | 3398 | /** |
| 3395 | - * @return string|bool Reason this DB is read-only or false if it is not |
|
| 3399 | + * @return string|false Reason this DB is read-only or false if it is not |
|
| 3396 | 3400 | */ |
| 3397 | 3401 | protected function getReadOnlyReason() { |
| 3398 | 3402 | $reason = $this->getLBInfo( 'readOnlyReason' ); |
@@ -92,6 +92,10 @@ discard block |
||
| 92 | 92 | fclose( $file ); |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | + /** |
|
| 96 | + * @param resource $file |
|
| 97 | + * @param integer $indent |
|
| 98 | + */ |
|
| 95 | 99 | private function dumpForm( $file, $length, $indent ) { |
| 96 | 100 | $start = ftell( $file ); |
| 97 | 101 | $secondary = fread( $file, 4 ); |
@@ -165,6 +169,9 @@ discard block |
||
| 165 | 169 | } |
| 166 | 170 | } |
| 167 | 171 | |
| 172 | + /** |
|
| 173 | + * @param integer $chunkLength |
|
| 174 | + */ |
|
| 168 | 175 | private function skipChunk( $file, $chunkLength ) { |
| 169 | 176 | fseek( $file, $chunkLength, SEEK_CUR ); |
| 170 | 177 | |
@@ -174,6 +181,9 @@ discard block |
||
| 174 | 181 | } |
| 175 | 182 | } |
| 176 | 183 | |
| 184 | + /** |
|
| 185 | + * @param resource $file |
|
| 186 | + */ |
|
| 177 | 187 | private function getMultiPageInfo( $file, $formLength ) { |
| 178 | 188 | // For now, we'll just look for the first page in the file |
| 179 | 189 | // and report its information, hoping others are the same size. |
@@ -368,6 +378,9 @@ discard block |
||
| 368 | 378 | return $xml; |
| 369 | 379 | } |
| 370 | 380 | |
| 381 | + /** |
|
| 382 | + * @param string $line |
|
| 383 | + */ |
|
| 371 | 384 | function parseFormDjvu( $line, &$xml ) { |
| 372 | 385 | $parentLevel = strspn( $line, ' ' ); |
| 373 | 386 | $line = strtok( "\n" ); |
@@ -104,7 +104,6 @@ |
||
| 104 | 104 | * |
| 105 | 105 | * See OutputPage::buildExemptModules() for use cases. |
| 106 | 106 | * |
| 107 | - * @param array $modules Module state keyed by module name |
|
| 108 | 107 | */ |
| 109 | 108 | public function setExemptStates( array $states ) { |
| 110 | 109 | $this->exemptStates = $states; |