@@ -650,7 +650,7 @@ discard block |
||
650 | 650 | } |
651 | 651 | |
652 | 652 | /** |
653 | - * @return bool|string |
|
653 | + * @return string|false |
|
654 | 654 | */ |
655 | 655 | protected function restoreErrorHandler() { |
656 | 656 | restore_error_handler(); |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | } |
663 | 663 | |
664 | 664 | /** |
665 | - * @return string|bool Last PHP error for this DB (typically connection errors) |
|
665 | + * @return string|false Last PHP error for this DB (typically connection errors) |
|
666 | 666 | */ |
667 | 667 | protected function getLastPHPError() { |
668 | 668 | if ( $this->mPHPError ) { |
@@ -770,7 +770,7 @@ discard block |
||
770 | 770 | } |
771 | 771 | |
772 | 772 | /** |
773 | - * @param $sql |
|
773 | + * @param string $sql |
|
774 | 774 | * @return string|null |
775 | 775 | */ |
776 | 776 | protected function getQueryVerb( $sql ) { |
@@ -917,6 +917,12 @@ discard block |
||
917 | 917 | return $res; |
918 | 918 | } |
919 | 919 | |
920 | + /** |
|
921 | + * @param string $sql |
|
922 | + * @param string $commentedSql |
|
923 | + * @param boolean $isWrite |
|
924 | + * @param string $fname |
|
925 | + */ |
|
920 | 926 | private function doProfiledQuery( $sql, $commentedSql, $isWrite, $fname ) { |
921 | 927 | $isMaster = !is_null( $this->getLBInfo( 'master' ) ); |
922 | 928 | # generalizeSQL() will probably cut down the query to reasonable |
@@ -998,6 +1004,10 @@ discard block |
||
998 | 1004 | } |
999 | 1005 | } |
1000 | 1006 | |
1007 | + /** |
|
1008 | + * @param string $sql |
|
1009 | + * @param boolean $priorWritesPending |
|
1010 | + */ |
|
1001 | 1011 | private function canRecoverFromDisconnect( $sql, $priorWritesPending ) { |
1002 | 1012 | # Transaction dropped; this can mean lost writes, or REPEATABLE-READ snapshots. |
1003 | 1013 | # Dropped connections also mean that named locks are automatically released. |
@@ -1117,7 +1127,7 @@ discard block |
||
1117 | 1127 | * |
1118 | 1128 | * @param array $options Associative array of options to be turned into |
1119 | 1129 | * an SQL query, valid keys are listed in the function. |
1120 | - * @return array |
|
1130 | + * @return string[] |
|
1121 | 1131 | * @see Database::select() |
1122 | 1132 | */ |
1123 | 1133 | protected function makeSelectOptions( $options ) { |
@@ -2288,6 +2298,9 @@ discard block |
||
2288 | 2298 | return $this->insert( $destTable, $rows, $fname, $insertOptions ); |
2289 | 2299 | } |
2290 | 2300 | |
2301 | + /** |
|
2302 | + * @param string $destTable |
|
2303 | + */ |
|
2291 | 2304 | protected function nativeInsertSelect( $destTable, $srcTable, $varMap, $conds, |
2292 | 2305 | $fname = __METHOD__, |
2293 | 2306 | $insertOptions = [], $selectOptions = [] |
@@ -3365,7 +3378,7 @@ discard block |
||
3365 | 3378 | } |
3366 | 3379 | |
3367 | 3380 | /** |
3368 | - * @return string|bool Reason this DB is read-only or false if it is not |
|
3381 | + * @return string|false Reason this DB is read-only or false if it is not |
|
3369 | 3382 | */ |
3370 | 3383 | protected function getReadOnlyReason() { |
3371 | 3384 | $reason = $this->getLBInfo( 'readOnlyReason' ); |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | * NOTE: This ONLY works for getTitleInfo() and isKnownEmpty(), NOT FOR ANYTHING ELSE. |
138 | 138 | * In particular, it doesn't work for getContent() or getScript() etc. |
139 | 139 | * |
140 | - * @return IDatabase|null |
|
140 | + * @return Database|null |
|
141 | 141 | */ |
142 | 142 | protected function getDB() { |
143 | 143 | return wfGetDB( DB_REPLICA ); |
@@ -277,6 +277,9 @@ discard block |
||
277 | 277 | return count( $revisions ) === 0; |
278 | 278 | } |
279 | 279 | |
280 | + /** |
|
281 | + * @param string $key |
|
282 | + */ |
|
280 | 283 | private function setTitleInfo( $key, array $titleInfo ) { |
281 | 284 | $this->titleInfo[$key] = $titleInfo; |
282 | 285 | } |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | * objects or LinkCache entries. Uses $wgContentHandlerUseDB to determine |
372 | 372 | * whether to include page_content_model. |
373 | 373 | * |
374 | - * @return array |
|
374 | + * @return string[] |
|
375 | 375 | */ |
376 | 376 | protected static function getSelectFields() { |
377 | 377 | global $wgContentHandlerUseDB, $wgPageLanguageUseDB; |
@@ -566,7 +566,7 @@ discard block |
||
566 | 566 | * Get the prefixed DB key associated with an ID |
567 | 567 | * |
568 | 568 | * @param int $id The page_id of the article |
569 | - * @return Title|null An object representing the article, or null if no such article was found |
|
569 | + * @return null|string An object representing the article, or null if no such article was found |
|
570 | 570 | */ |
571 | 571 | public static function nameOf( $id ) { |
572 | 572 | $dbr = wfGetDB( DB_REPLICA ); |
@@ -1104,7 +1104,6 @@ discard block |
||
1104 | 1104 | /** |
1105 | 1105 | * Returns true if the title is inside one of the specified namespaces. |
1106 | 1106 | * |
1107 | - * @param int|int[] $namespaces,... The namespaces to check for |
|
1108 | 1107 | * @return bool |
1109 | 1108 | * @since 1.19 |
1110 | 1109 | */ |
@@ -1914,7 +1913,7 @@ discard block |
||
1914 | 1913 | * - quick : does cheap permission checks from replica DBs (usable for GUI creation) |
1915 | 1914 | * - full : does cheap and expensive checks possibly from a replica DB |
1916 | 1915 | * - secure : does cheap and expensive checks, using the master as needed |
1917 | - * @param array $ignoreErrors Array of Strings Set this to a list of message keys |
|
1916 | + * @param string[] $ignoreErrors Array of Strings Set this to a list of message keys |
|
1918 | 1917 | * whose corresponding errors may be ignored. |
1919 | 1918 | * @return array Array of arrays of the arguments to wfMessage to explain permissions problems. |
1920 | 1919 | */ |
@@ -2015,7 +2014,7 @@ discard block |
||
2015 | 2014 | * Add the resulting error code to the errors array |
2016 | 2015 | * |
2017 | 2016 | * @param array $errors List of current errors |
2018 | - * @param array $result Result of errors |
|
2017 | + * @param string $result Result of errors |
|
2019 | 2018 | * |
2020 | 2019 | * @return array List of errors |
2021 | 2020 | */ |
@@ -2410,7 +2409,7 @@ discard block |
||
2410 | 2409 | * |
2411 | 2410 | * @param string $action The action to check |
2412 | 2411 | * @param bool $short Short circuit on first error |
2413 | - * @return array List of errors |
|
2412 | + * @return string[] List of errors |
|
2414 | 2413 | */ |
2415 | 2414 | private function missingPermissionError( $action, $short ) { |
2416 | 2415 | // We avoid expensive display logic for quickUserCan's and such |
@@ -3934,7 +3933,7 @@ discard block |
||
3934 | 3933 | * Get an associative array for selecting this title from |
3935 | 3934 | * the "page" table |
3936 | 3935 | * |
3937 | - * @return array Array suitable for the $where parameter of DB::select() |
|
3936 | + * @return IDatabase Array suitable for the $where parameter of DB::select() |
|
3938 | 3937 | */ |
3939 | 3938 | public function pageCond() { |
3940 | 3939 | if ( $this->mArticleID > 0 ) { |
@@ -3950,7 +3949,7 @@ discard block |
||
3950 | 3949 | * |
3951 | 3950 | * @param int $revId Revision ID. Get the revision that was before this one. |
3952 | 3951 | * @param int $flags Title::GAID_FOR_UPDATE |
3953 | - * @return int|bool Old revision ID, or false if none exists |
|
3952 | + * @return integer Old revision ID, or false if none exists |
|
3954 | 3953 | */ |
3955 | 3954 | public function getPreviousRevisionID( $revId, $flags = 0 ) { |
3956 | 3955 | $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_REPLICA ); |
@@ -4090,8 +4089,8 @@ discard block |
||
4090 | 4089 | * Get the number of revisions between the given revision. |
4091 | 4090 | * Used for diffs and other things that really need it. |
4092 | 4091 | * |
4093 | - * @param int|Revision $old Old revision or rev ID (first before range) |
|
4094 | - * @param int|Revision $new New revision or rev ID (first after range) |
|
4092 | + * @param Revision $old Old revision or rev ID (first before range) |
|
4093 | + * @param Revision $new New revision or rev ID (first after range) |
|
4095 | 4094 | * @param int|null $max Limit of Revisions to count, will be incremented to detect truncations |
4096 | 4095 | * @return int Number of revisions between these revisions. |
4097 | 4096 | */ |
@@ -4203,9 +4202,9 @@ discard block |
||
4203 | 4202 | * Used for diffs and other things that really need it. |
4204 | 4203 | * |
4205 | 4204 | * @param int|Revision $old Old revision or rev ID (first before range by default) |
4206 | - * @param int|Revision $new New revision or rev ID (first after range by default) |
|
4205 | + * @param Revision $new New revision or rev ID (first after range by default) |
|
4207 | 4206 | * @param int $limit Maximum number of authors |
4208 | - * @param string|array $options (Optional): Single option, or an array of options: |
|
4207 | + * @param string $options (Optional): Single option, or an array of options: |
|
4209 | 4208 | * 'include_old' Include $old in the range; $new is excluded. |
4210 | 4209 | * 'include_new' Include $new in the range; $old is excluded. |
4211 | 4210 | * 'include_both' Include both $old and $new in the range. |
@@ -4361,7 +4360,7 @@ discard block |
||
4361 | 4360 | /** |
4362 | 4361 | * Get the default message text or false if the message doesn't exist |
4363 | 4362 | * |
4364 | - * @return string|bool |
|
4363 | + * @return false|string |
|
4365 | 4364 | */ |
4366 | 4365 | public function getDefaultMessageText() { |
4367 | 4366 | global $wgContLang; |
@@ -4812,7 +4811,7 @@ discard block |
||
4812 | 4811 | } |
4813 | 4812 | |
4814 | 4813 | /** |
4815 | - * @return array |
|
4814 | + * @return string[] |
|
4816 | 4815 | */ |
4817 | 4816 | public function __sleep() { |
4818 | 4817 | return [ |
@@ -661,7 +661,7 @@ discard block |
||
661 | 661 | * Add one or more head items to the output |
662 | 662 | * |
663 | 663 | * @since 1.28 |
664 | - * @param string|string[] $value Raw HTML |
|
664 | + * @param string|string[] $values Raw HTML |
|
665 | 665 | */ |
666 | 666 | public function addHeadItems( $values ) { |
667 | 667 | $this->mHeadItems = array_merge( $this->mHeadItems, (array)$values ); |
@@ -978,7 +978,7 @@ discard block |
||
978 | 978 | /** |
979 | 979 | * Replace the subtitle with $str |
980 | 980 | * |
981 | - * @param string|Message $str New value of the subtitle. String should be safe HTML. |
|
981 | + * @param string $str New value of the subtitle. String should be safe HTML. |
|
982 | 982 | */ |
983 | 983 | public function setSubtitle( $str ) { |
984 | 984 | $this->clearSubtitle(); |
@@ -1596,7 +1596,7 @@ discard block |
||
1596 | 1596 | /** |
1597 | 1597 | * Set the displayed file version |
1598 | 1598 | * |
1599 | - * @param File|bool $file |
|
1599 | + * @param File $file |
|
1600 | 1600 | * @return mixed Previous value |
1601 | 1601 | */ |
1602 | 1602 | public function setFileVersion( $file ) { |
@@ -1940,7 +1940,7 @@ discard block |
||
1940 | 1940 | * the TTL is higher the older the $mtime timestamp is. Essentially, the |
1941 | 1941 | * TTL is 90% of the age of the object, subject to the min and max. |
1942 | 1942 | * |
1943 | - * @param string|integer|float|bool|null $mtime Last-Modified timestamp |
|
1943 | + * @param false|string $mtime Last-Modified timestamp |
|
1944 | 1944 | * @param integer $minTTL Mimimum TTL in seconds [default: 1 minute] |
1945 | 1945 | * @param integer $maxTTL Maximum TTL in seconds [default: $wgSquidMaxage] |
1946 | 1946 | * @return integer TTL in seconds |
@@ -1977,7 +1977,7 @@ discard block |
||
1977 | 1977 | /** |
1978 | 1978 | * Get the list of cookies that will influence on the cache |
1979 | 1979 | * |
1980 | - * @return array |
|
1980 | + * @return string[] |
|
1981 | 1981 | */ |
1982 | 1982 | function getCacheVaryCookies() { |
1983 | 1983 | static $cookies; |
@@ -2368,7 +2368,7 @@ discard block |
||
2368 | 2368 | * indexing, clear the current text and redirect, set the page's title |
2369 | 2369 | * and optionally an custom HTML title (content of the "<title>" tag). |
2370 | 2370 | * |
2371 | - * @param string|Message $pageTitle Will be passed directly to setPageTitle() |
|
2371 | + * @param Message $pageTitle Will be passed directly to setPageTitle() |
|
2372 | 2372 | * @param string|Message $htmlTitle Will be passed directly to setHTMLTitle(); |
2373 | 2373 | * optional, if not passed the "<title>" attribute will be |
2374 | 2374 | * based on $pageTitle |
@@ -2394,8 +2394,8 @@ discard block |
||
2394 | 2394 | * showErrorPage( 'titlemsg', $messageObject ); |
2395 | 2395 | * showErrorPage( $titleMessageObject, $messageObject ); |
2396 | 2396 | * |
2397 | - * @param string|Message $title Message key (string) for page title, or a Message object |
|
2398 | - * @param string|Message $msg Message key (string) for page text, or a Message object |
|
2397 | + * @param string $title Message key (string) for page title, or a Message object |
|
2398 | + * @param string $msg Message key (string) for page text, or a Message object |
|
2399 | 2399 | * @param array $params Message parameters; ignored if $msg is a Message object |
2400 | 2400 | */ |
2401 | 2401 | public function showErrorPage( $title, $msg, $params = [] ) { |
@@ -2596,6 +2596,9 @@ discard block |
||
2596 | 2596 | } |
2597 | 2597 | } |
2598 | 2598 | |
2599 | + /** |
|
2600 | + * @param string $message |
|
2601 | + */ |
|
2599 | 2602 | public function showFatalError( $message ) { |
2600 | 2603 | $this->prepareErrorPage( $this->msg( 'internalerror' ) ); |
2601 | 2604 | |
@@ -2614,6 +2617,9 @@ discard block |
||
2614 | 2617 | $this->showFatalError( $this->msg( 'filerenameerror', $old, $new )->text() ); |
2615 | 2618 | } |
2616 | 2619 | |
2620 | + /** |
|
2621 | + * @param string $name |
|
2622 | + */ |
|
2617 | 2623 | public function showFileDeleteError( $name ) { |
2618 | 2624 | $this->showFatalError( $this->msg( 'filedeleteerror', $name )->text() ); |
2619 | 2625 | } |
@@ -2640,7 +2646,7 @@ discard block |
||
2640 | 2646 | * Add a "return to" link pointing to a specified title, |
2641 | 2647 | * or the title indicated in the request, or else the main page |
2642 | 2648 | * |
2643 | - * @param mixed $unused |
|
2649 | + * @param null|boolean $unused |
|
2644 | 2650 | * @param Title|string $returnto Title or String to return to |
2645 | 2651 | * @param string $returntoquery Query string for the return to link |
2646 | 2652 | */ |
@@ -3668,7 +3674,7 @@ discard block |
||
3668 | 3674 | * Caller is responsible for ensuring the file exists. Emits a PHP warning otherwise. |
3669 | 3675 | * |
3670 | 3676 | * @since 1.27 |
3671 | - * @param string $remotePath URL path prefix that points to $localPath |
|
3677 | + * @param string $remotePathPrefix URL path prefix that points to $localPath |
|
3672 | 3678 | * @param string $localPath File directory exposed at $remotePath |
3673 | 3679 | * @param string $file Path to target file relative to $localPath |
3674 | 3680 | * @return string URL |
@@ -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 ) { |
@@ -235,7 +235,6 @@ discard block |
||
235 | 235 | * [ 'y' ] |
236 | 236 | * ] |
237 | 237 | * |
238 | - * @param array $array1,... |
|
239 | 238 | * @return array |
240 | 239 | */ |
241 | 240 | function wfMergeErrorArrays( /*...*/ ) { |
@@ -262,8 +261,8 @@ discard block |
||
262 | 261 | * |
263 | 262 | * @param array $array The array. |
264 | 263 | * @param array $insert The array to insert. |
265 | - * @param mixed $after The key to insert after |
|
266 | - * @return array |
|
264 | + * @param string $after The key to insert after |
|
265 | + * @return string[] |
|
267 | 266 | */ |
268 | 267 | function wfArrayInsertAfter( array $array, array $insert, $after ) { |
269 | 268 | // Find the offset of the element to insert after. |
@@ -1302,7 +1301,7 @@ discard block |
||
1302 | 1301 | /** |
1303 | 1302 | * Get the value of $wgReadOnly or the contents of $wgReadOnlyFile. |
1304 | 1303 | * |
1305 | - * @return string|bool String when in read-only mode; false otherwise |
|
1304 | + * @return string|false String when in read-only mode; false otherwise |
|
1306 | 1305 | * @since 1.27 |
1307 | 1306 | */ |
1308 | 1307 | function wfConfiguredReadOnlyReason() { |
@@ -1377,7 +1376,6 @@ discard block |
||
1377 | 1376 | * This function replaces all old wfMsg* functions. |
1378 | 1377 | * |
1379 | 1378 | * @param string|string[]|MessageSpecifier $key Message key, or array of keys, or a MessageSpecifier |
1380 | - * @param mixed $params,... Normal message parameters |
|
1381 | 1379 | * @return Message |
1382 | 1380 | * |
1383 | 1381 | * @since 1.17 |
@@ -1398,7 +1396,6 @@ discard block |
||
1398 | 1396 | * for the first message which is non-empty. If all messages are empty then an |
1399 | 1397 | * instance of the first message key is returned. |
1400 | 1398 | * |
1401 | - * @param string|string[] $keys,... Message keys |
|
1402 | 1399 | * @return Message |
1403 | 1400 | * |
1404 | 1401 | * @since 1.18 |
@@ -1631,7 +1628,7 @@ discard block |
||
1631 | 1628 | * Use this when considering to send a gzip-encoded response to the client. |
1632 | 1629 | * |
1633 | 1630 | * @param bool $force Forces another check even if we already have a cached result. |
1634 | - * @return bool |
|
1631 | + * @return null|boolean |
|
1635 | 1632 | */ |
1636 | 1633 | function wfClientAcceptsGzip( $force = false ) { |
1637 | 1634 | static $result = null; |
@@ -1719,7 +1716,7 @@ discard block |
||
1719 | 1716 | * @param mixed $dest |
1720 | 1717 | * @param mixed $source |
1721 | 1718 | * @param bool $force |
1722 | - * @return mixed |
|
1719 | + * @return string |
|
1723 | 1720 | */ |
1724 | 1721 | function wfSetVar( &$dest, $source, $force = false ) { |
1725 | 1722 | $temp = $dest; |
@@ -1769,7 +1766,7 @@ discard block |
||
1769 | 1766 | /** |
1770 | 1767 | * Provide a simple HTTP error. |
1771 | 1768 | * |
1772 | - * @param int|string $code |
|
1769 | + * @param integer $code |
|
1773 | 1770 | * @param string $label |
1774 | 1771 | * @param string $desc |
1775 | 1772 | */ |
@@ -2002,8 +1999,8 @@ discard block |
||
2002 | 1999 | * |
2003 | 2000 | * @param mixed $outputtype A timestamp in one of the supported formats, the |
2004 | 2001 | * function will autodetect which format is supplied and act accordingly. |
2005 | - * @param mixed $ts Optional timestamp to convert, default 0 for the current time |
|
2006 | - * @return string|bool String / false The same date in the format specified in $outputtype or false |
|
2002 | + * @param integer $ts Optional timestamp to convert, default 0 for the current time |
|
2003 | + * @return false|string String / false The same date in the format specified in $outputtype or false |
|
2007 | 2004 | */ |
2008 | 2005 | function wfTimestamp( $outputtype = TS_UNIX, $ts = 0 ) { |
2009 | 2006 | $ret = MWTimestamp::convert( $outputtype, $ts ); |
@@ -2042,7 +2039,7 @@ discard block |
||
2042 | 2039 | /** |
2043 | 2040 | * Check if the operating system is Windows |
2044 | 2041 | * |
2045 | - * @return bool True if it's Windows, false otherwise. |
|
2042 | + * @return boolean|null True if it's Windows, false otherwise. |
|
2046 | 2043 | */ |
2047 | 2044 | function wfIsWindows() { |
2048 | 2045 | static $isWindows = null; |
@@ -2270,7 +2267,7 @@ discard block |
||
2270 | 2267 | /** |
2271 | 2268 | * Check if wfShellExec() is effectively disabled via php.ini config |
2272 | 2269 | * |
2273 | - * @return bool|string False or 'disabled' |
|
2270 | + * @return string|false False or 'disabled' |
|
2274 | 2271 | * @since 1.22 |
2275 | 2272 | */ |
2276 | 2273 | function wfShellExecDisabled() { |
@@ -2884,7 +2881,7 @@ discard block |
||
2884 | 2881 | * @param int $pad Minimum number of digits in the output (pad with zeroes) |
2885 | 2882 | * @param bool $lowercase Whether to output in lowercase or uppercase |
2886 | 2883 | * @param string $engine Either "gmp", "bcmath", or "php" |
2887 | - * @return string|bool The output number as a string, or false on error |
|
2884 | + * @return false|string The output number as a string, or false on error |
|
2888 | 2885 | */ |
2889 | 2886 | function wfBaseConvert( $input, $sourceBase, $destBase, $pad = 1, |
2890 | 2887 | $lowercase = true, $engine = 'auto' |
@@ -2969,7 +2966,6 @@ discard block |
||
2969 | 2966 | /** |
2970 | 2967 | * Make a cache key for the local wiki. |
2971 | 2968 | * |
2972 | - * @param string $args,... |
|
2973 | 2969 | * @return string |
2974 | 2970 | */ |
2975 | 2971 | function wfMemcKey( /*...*/ ) { |
@@ -2986,7 +2982,6 @@ discard block |
||
2986 | 2982 | * |
2987 | 2983 | * @param string $db |
2988 | 2984 | * @param string $prefix |
2989 | - * @param string $args,... |
|
2990 | 2985 | * @return string |
2991 | 2986 | */ |
2992 | 2987 | function wfForeignMemcKey( $db, $prefix /*...*/ ) { |
@@ -3006,7 +3001,6 @@ discard block |
||
3006 | 3001 | * in the first segment will clash with wfMemcKey/wfForeignMemcKey. |
3007 | 3002 | * |
3008 | 3003 | * @since 1.26 |
3009 | - * @param string $args,... |
|
3010 | 3004 | * @return string |
3011 | 3005 | */ |
3012 | 3006 | function wfGlobalCacheKey( /*...*/ ) { |
@@ -3121,7 +3115,7 @@ discard block |
||
3121 | 3115 | * Returns a valid placeholder object if the file does not exist. |
3122 | 3116 | * |
3123 | 3117 | * @param Title|string $title |
3124 | - * @return LocalFile|null A File, or null if passed an invalid Title |
|
3118 | + * @return File|null A File, or null if passed an invalid Title |
|
3125 | 3119 | */ |
3126 | 3120 | function wfLocalFile( $title ) { |
3127 | 3121 | return RepoGroup::singleton()->getLocalRepo()->newFile( $title ); |
@@ -3326,7 +3320,7 @@ discard block |
||
3326 | 3320 | /** |
3327 | 3321 | * Set PHP's time limit to the larger of php.ini or $wgTransactionalTimeLimit |
3328 | 3322 | * |
3329 | - * @return int Prior time limit |
|
3323 | + * @return string Prior time limit |
|
3330 | 3324 | * @since 1.26 |
3331 | 3325 | */ |
3332 | 3326 | function wfTransactionalTimeLimit() { |
@@ -3462,7 +3456,7 @@ discard block |
||
3462 | 3456 | * |
3463 | 3457 | * @param string $format The format string (See php's docs) |
3464 | 3458 | * @param string $data A binary string of binary data |
3465 | - * @param int|bool $length The minimum length of $data or false. This is to |
|
3459 | + * @param integer $length The minimum length of $data or false. This is to |
|
3466 | 3460 | * prevent reading beyond the end of $data. false to disable the check. |
3467 | 3461 | * |
3468 | 3462 | * Also be careful when using this function to read unsigned 32 bit integer |
@@ -60,6 +60,9 @@ discard block |
||
60 | 60 | return false; |
61 | 61 | } |
62 | 62 | |
63 | + /** |
|
64 | + * @param string $name |
|
65 | + */ |
|
63 | 66 | public function hasConstraint( $name ) { |
64 | 67 | $conn = $this->getBindingHandle(); |
65 | 68 | |
@@ -1070,6 +1073,10 @@ discard block |
||
1070 | 1073 | return $this->relationExists( $sequence, 'S', $schema ); |
1071 | 1074 | } |
1072 | 1075 | |
1076 | + /** |
|
1077 | + * @param string $table |
|
1078 | + * @param string $trigger |
|
1079 | + */ |
|
1073 | 1080 | public function triggerExists( $table, $trigger ) { |
1074 | 1081 | $q = <<<SQL |
1075 | 1082 | SELECT 1 FROM pg_class, pg_namespace, pg_trigger |
@@ -1093,6 +1100,10 @@ discard block |
||
1093 | 1100 | return $rows; |
1094 | 1101 | } |
1095 | 1102 | |
1103 | + /** |
|
1104 | + * @param string $table |
|
1105 | + * @param string $rule |
|
1106 | + */ |
|
1096 | 1107 | public function ruleExists( $table, $rule ) { |
1097 | 1108 | $exists = $this->selectField( 'pg_rules', 'rulename', |
1098 | 1109 | [ |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | /** |
296 | 296 | * Get an argument. |
297 | 297 | * @param int $argId The integer value (from zero) for the arg |
298 | - * @param mixed $default The default if it doesn't exist |
|
298 | + * @param string $default The default if it doesn't exist |
|
299 | 299 | * @return mixed |
300 | 300 | */ |
301 | 301 | protected function getArg( $argId = 0, $default = null ) { |
@@ -1346,6 +1346,7 @@ discard block |
||
1346 | 1346 | * Unlock and lock again |
1347 | 1347 | * Since the lock is low-priority, queued reads will be able to complete |
1348 | 1348 | * @param Database &$db |
1349 | + * @param Database $db |
|
1349 | 1350 | */ |
1350 | 1351 | private function relockSearchindex( $db ) { |
1351 | 1352 | $this->unlockSearchindex( $db ); |
@@ -1507,7 +1508,7 @@ discard block |
||
1507 | 1508 | * is the width (number of columns) and the second element is the height |
1508 | 1509 | * (number of rows). |
1509 | 1510 | * |
1510 | - * @return array |
|
1511 | + * @return integer[] |
|
1511 | 1512 | */ |
1512 | 1513 | public static function getTermSize() { |
1513 | 1514 | $default = [ 80, 50 ]; |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * 1 => object(Status) # The Status with warning messages, only |
114 | 114 | * ] |
115 | 115 | * |
116 | - * @return Status[] |
|
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 |