@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | * objects or LinkCache entries. Uses $wgContentHandlerUseDB to determine |
366 | 366 | * whether to include page_content_model. |
367 | 367 | * |
368 | - * @return array |
|
368 | + * @return string[] |
|
369 | 369 | */ |
370 | 370 | protected static function getSelectFields() { |
371 | 371 | global $wgContentHandlerUseDB, $wgPageLanguageUseDB; |
@@ -558,7 +558,7 @@ discard block |
||
558 | 558 | * Get the prefixed DB key associated with an ID |
559 | 559 | * |
560 | 560 | * @param int $id The page_id of the article |
561 | - * @return Title|null An object representing the article, or null if no such article was found |
|
561 | + * @return null|string An object representing the article, or null if no such article was found |
|
562 | 562 | */ |
563 | 563 | public static function nameOf( $id ) { |
564 | 564 | $dbr = wfGetDB( DB_SLAVE ); |
@@ -1079,7 +1079,6 @@ discard block |
||
1079 | 1079 | /** |
1080 | 1080 | * Returns true if the title is inside one of the specified namespaces. |
1081 | 1081 | * |
1082 | - * @param int $namespaces,... The namespaces to check for |
|
1083 | 1082 | * @return bool |
1084 | 1083 | * @since 1.19 |
1085 | 1084 | */ |
@@ -1889,7 +1888,7 @@ discard block |
||
1889 | 1888 | * - quick : does cheap permission checks from slaves (usable for GUI creation) |
1890 | 1889 | * - full : does cheap and expensive checks possibly from a slave |
1891 | 1890 | * - secure : does cheap and expensive checks, using the master as needed |
1892 | - * @param array $ignoreErrors Array of Strings Set this to a list of message keys |
|
1891 | + * @param string[] $ignoreErrors Array of Strings Set this to a list of message keys |
|
1893 | 1892 | * whose corresponding errors may be ignored. |
1894 | 1893 | * @return array Array of arrays of the arguments to wfMessage to explain permissions problems. |
1895 | 1894 | */ |
@@ -1990,7 +1989,7 @@ discard block |
||
1990 | 1989 | * Add the resulting error code to the errors array |
1991 | 1990 | * |
1992 | 1991 | * @param array $errors List of current errors |
1993 | - * @param array $result Result of errors |
|
1992 | + * @param string $result Result of errors |
|
1994 | 1993 | * |
1995 | 1994 | * @return array List of errors |
1996 | 1995 | */ |
@@ -2381,7 +2380,7 @@ discard block |
||
2381 | 2380 | * |
2382 | 2381 | * @param string $action The action to check |
2383 | 2382 | * @param bool $short Short circuit on first error |
2384 | - * @return array List of errors |
|
2383 | + * @return string[] List of errors |
|
2385 | 2384 | */ |
2386 | 2385 | private function missingPermissionError( $action, $short ) { |
2387 | 2386 | // We avoid expensive display logic for quickUserCan's and such |
@@ -3920,7 +3919,7 @@ discard block |
||
3920 | 3919 | * |
3921 | 3920 | * @param int $revId Revision ID. Get the revision that was before this one. |
3922 | 3921 | * @param int $flags Title::GAID_FOR_UPDATE |
3923 | - * @return int|bool Old revision ID, or false if none exists |
|
3922 | + * @return integer Old revision ID, or false if none exists |
|
3924 | 3923 | */ |
3925 | 3924 | public function getPreviousRevisionID( $revId, $flags = 0 ) { |
3926 | 3925 | $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE ); |
@@ -4060,8 +4059,8 @@ discard block |
||
4060 | 4059 | * Get the number of revisions between the given revision. |
4061 | 4060 | * Used for diffs and other things that really need it. |
4062 | 4061 | * |
4063 | - * @param int|Revision $old Old revision or rev ID (first before range) |
|
4064 | - * @param int|Revision $new New revision or rev ID (first after range) |
|
4062 | + * @param Revision $old Old revision or rev ID (first before range) |
|
4063 | + * @param Revision $new New revision or rev ID (first after range) |
|
4065 | 4064 | * @param int|null $max Limit of Revisions to count, will be incremented to detect truncations |
4066 | 4065 | * @return int Number of revisions between these revisions. |
4067 | 4066 | */ |
@@ -4173,9 +4172,9 @@ discard block |
||
4173 | 4172 | * Used for diffs and other things that really need it. |
4174 | 4173 | * |
4175 | 4174 | * @param int|Revision $old Old revision or rev ID (first before range by default) |
4176 | - * @param int|Revision $new New revision or rev ID (first after range by default) |
|
4175 | + * @param Revision $new New revision or rev ID (first after range by default) |
|
4177 | 4176 | * @param int $limit Maximum number of authors |
4178 | - * @param string|array $options (Optional): Single option, or an array of options: |
|
4177 | + * @param string $options (Optional): Single option, or an array of options: |
|
4179 | 4178 | * 'include_old' Include $old in the range; $new is excluded. |
4180 | 4179 | * 'include_new' Include $new in the range; $old is excluded. |
4181 | 4180 | * 'include_both' Include both $old and $new in the range. |
@@ -4331,7 +4330,7 @@ discard block |
||
4331 | 4330 | /** |
4332 | 4331 | * Get the default message text or false if the message doesn't exist |
4333 | 4332 | * |
4334 | - * @return string|bool |
|
4333 | + * @return false|string |
|
4335 | 4334 | */ |
4336 | 4335 | public function getDefaultMessageText() { |
4337 | 4336 | global $wgContLang; |
@@ -4778,7 +4777,7 @@ discard block |
||
4778 | 4777 | } |
4779 | 4778 | |
4780 | 4779 | /** |
4781 | - * @return array |
|
4780 | + * @return string[] |
|
4782 | 4781 | */ |
4783 | 4782 | public function __sleep() { |
4784 | 4783 | return [ |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * Set the browser cookie |
81 | 81 | * @param string $name The name of the cookie. |
82 | 82 | * @param string $value The value to be stored in the cookie. |
83 | - * @param int|null $expire Unix timestamp (in seconds) when the cookie should expire. |
|
83 | + * @param integer $expire Unix timestamp (in seconds) when the cookie should expire. |
|
84 | 84 | * 0 (the default) causes it to expire $wgCookieExpiration seconds from now. |
85 | 85 | * null causes it to be a session cookie. |
86 | 86 | * @param array $options Assoc of additional cookie options: |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | /** |
248 | 248 | * @param string $name The name of the cookie. |
249 | 249 | * @param string $value The value to be stored in the cookie. |
250 | - * @param int|null $expire Ignored in this faux subclass. |
|
250 | + * @param integer $expire Ignored in this faux subclass. |
|
251 | 251 | * @param array $options Ignored in this faux subclass. |
252 | 252 | */ |
253 | 253 | public function setCookie( $name, $value, $expire = 0, $options = [] ) { |
@@ -113,6 +113,11 @@ |
||
113 | 113 | return $status; |
114 | 114 | } |
115 | 115 | |
116 | + /** |
|
117 | + * @param string $lockSrv |
|
118 | + * |
|
119 | + * @return Status |
|
120 | + */ |
|
116 | 121 | abstract protected function doGetLocksOnServer( $lockSrv, array $paths, $type ); |
117 | 122 | |
118 | 123 | protected function freeLocksOnServer( $lockSrv, array $pathsByType ) { |