@@ -390,7 +390,7 @@ |
||
390 | 390 | } |
391 | 391 | |
392 | 392 | /** |
393 | - * @param DatabaseDomain|string|bool $domain Domain ID, or false for the current domain |
|
393 | + * @param boolean|string $domain Domain ID, or false for the current domain |
|
394 | 394 | * @return array [database name, table prefix] |
395 | 395 | */ |
396 | 396 | private function getDBNameAndPrefix( $domain = false ) { |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | * 1 => object(StatusValue) # The StatusValue with warning messages, only |
89 | 89 | * ] |
90 | 90 | * |
91 | - * @return array |
|
91 | + * @return StatusValue[] |
|
92 | 92 | */ |
93 | 93 | public function splitByErrorType() { |
94 | 94 | $errorsOnlyStatusValue = clone $this; |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | /** |
247 | 247 | * Returns true if the specified message is present as a warning or error |
248 | 248 | * |
249 | - * @param string|MessageSpecifier $message Message key or object to search for |
|
249 | + * @param string $message Message key or object to search for |
|
250 | 250 | * |
251 | 251 | * @return bool |
252 | 252 | */ |
@@ -274,8 +274,8 @@ discard block |
||
274 | 274 | * Note, due to the lack of tools for comparing IStatusMessage objects, this |
275 | 275 | * function will not work when using such an object as the search parameter. |
276 | 276 | * |
277 | - * @param MessageSpecifier|string $source Message key or object to search for |
|
278 | - * @param MessageSpecifier|string $dest Replacement message key or object |
|
277 | + * @param string $source Message key or object to search for |
|
278 | + * @param string $dest Replacement message key or object |
|
279 | 279 | * @return bool Return true if the replacement was done, false otherwise. |
280 | 280 | */ |
281 | 281 | public function replaceMessage( $source, $dest ) { |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * 1 => object(Status) # The Status with warning messages, only |
114 | 114 | * ] |
115 | 115 | * |
116 | - * @return array |
|
116 | + * @return StatusValue[] |
|
117 | 117 | */ |
118 | 118 | public function splitByErrorType() { |
119 | 119 | list( $errorsOnlyStatus, $warningsOnlyStatus ) = parent::splitByErrorType(); |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | * |
226 | 226 | * If both parameters are missing, and there is only one error, no bullet will be added. |
227 | 227 | * |
228 | - * @param string|string[]|bool $shortContext A message name or an array of message names. |
|
228 | + * @param string $shortContext A message name or an array of message names. |
|
229 | 229 | * @param string|string[]|bool $longContext A message name or an array of message names. |
230 | 230 | * @param string|Language $lang Language to use for processing messages |
231 | 231 | * @return Message |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | * Borrows Recent Changes' feed generation functions for formatting; |
318 | 318 | * includes a diff to the previous revision (if any). |
319 | 319 | * |
320 | - * @param stdClass|array $row Database row |
|
320 | + * @param null|stdClass $row Database row |
|
321 | 321 | * @return FeedItem |
322 | 322 | */ |
323 | 323 | function feedItem( $row ) { |
@@ -534,6 +534,10 @@ discard block |
||
534 | 534 | return $s; |
535 | 535 | } |
536 | 536 | |
537 | + /** |
|
538 | + * @param string $name |
|
539 | + * @param string $msg |
|
540 | + */ |
|
537 | 541 | private function getRevisionButton( $name, $msg ) { |
538 | 542 | $this->preventClickjacking(); |
539 | 543 | # Note bug #20966, <button> is non-standard in IE<8 |
@@ -154,7 +154,7 @@ |
||
154 | 154 | * Extract information from the Revision |
155 | 155 | * |
156 | 156 | * @param Revision $revision |
157 | - * @param object $row Should have a field 'ts_tags' if $this->fld_tags is set |
|
157 | + * @param null|stdClass $row Should have a field 'ts_tags' if $this->fld_tags is set |
|
158 | 158 | * @return array |
159 | 159 | */ |
160 | 160 | protected function extractRevisionInfo( Revision $revision, $row ) { |
@@ -447,6 +447,9 @@ |
||
447 | 447 | return $vals; |
448 | 448 | } |
449 | 449 | |
450 | + /** |
|
451 | + * @param null|stdClass $row |
|
452 | + */ |
|
450 | 453 | private function continueStr( $row ) { |
451 | 454 | if ( $this->multiUserMode ) { |
452 | 455 | if ( $this->idMode ) { |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | /** |
31 | 31 | * @param Exception|Throwable $e Original exception |
32 | 32 | * @param integer $mode MWExceptionExposer::AS_* constant |
33 | - * @param Exception|Throwable|null $eNew New exception from attempting to show the first |
|
33 | + * @param Exception $eNew New exception from attempting to show the first |
|
34 | 34 | */ |
35 | 35 | public static function output( $e, $mode, $eNew = null ) { |
36 | 36 | global $wgMimeType; |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | } |
325 | 325 | |
326 | 326 | /** |
327 | - * @param Exception|Throwable $e |
|
327 | + * @param DBConnectionError $e |
|
328 | 328 | */ |
329 | 329 | private static function reportOutageHTML( $e ) { |
330 | 330 | global $wgShowDBErrorBacktrace, $wgShowHostnames, $wgShowSQLErrors; |
@@ -816,7 +816,7 @@ discard block |
||
816 | 816 | /** |
817 | 817 | * Get the position of the master from SHOW SLAVE STATUS |
818 | 818 | * |
819 | - * @return MySQLMasterPos|bool |
|
819 | + * @return DBMasterPos |
|
820 | 820 | */ |
821 | 821 | function getSlavePos() { |
822 | 822 | $res = $this->query( 'SHOW SLAVE STATUS', __METHOD__ ); |
@@ -1012,6 +1012,9 @@ discard block |
||
1012 | 1012 | return false; |
1013 | 1013 | } |
1014 | 1014 | |
1015 | + /** |
|
1016 | + * @param string $lockName |
|
1017 | + */ |
|
1015 | 1018 | private function makeLockName( $lockName ) { |
1016 | 1019 | // http://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_get-lock |
1017 | 1020 | // Newer version enforce a 64 char length limit. |
@@ -122,7 +122,7 @@ |
||
122 | 122 | } |
123 | 123 | |
124 | 124 | /** |
125 | - * @return stdClass|array|bool |
|
125 | + * @return null|stdClass |
|
126 | 126 | */ |
127 | 127 | function current() { |
128 | 128 | if ( is_null( $this->currentRow ) ) { |