@@ -92,7 +92,7 @@ |
||
92 | 92 | * Adds a line to the log |
93 | 93 | * |
94 | 94 | * @since 1.19 |
95 | - * @param mixed $str |
|
95 | + * @param string $str |
|
96 | 96 | */ |
97 | 97 | public static function log( $str ) { |
98 | 98 | if ( !self::$enabled ) { |
@@ -470,6 +470,10 @@ discard block |
||
470 | 470 | return $status; |
471 | 471 | } |
472 | 472 | |
473 | + /** |
|
474 | + * @param string $fullCont |
|
475 | + * @param string $dirRel |
|
476 | + */ |
|
473 | 477 | protected function doSecureInternal( $fullCont, $dirRel, array $params ) { |
474 | 478 | $status = Status::newGood(); |
475 | 479 | list( , $shortCont, ) = FileBackend::splitStoragePath( $params['dir'] ); |
@@ -885,7 +889,7 @@ discard block |
||
885 | 889 | |
886 | 890 | /** |
887 | 891 | * @see Iterator::current() |
888 | - * @return string|bool String or false |
|
892 | + * @return string String or false |
|
889 | 893 | */ |
890 | 894 | public function current() { |
891 | 895 | return $this->getRelPath( $this->iter->current()->getPathname() ); |
@@ -377,7 +377,7 @@ |
||
377 | 377 | |
378 | 378 | /** |
379 | 379 | * @see JobQueue::pop() |
380 | - * @return Job|bool |
|
380 | + * @return Job |
|
381 | 381 | */ |
382 | 382 | abstract protected function doPop(); |
383 | 383 |
@@ -302,8 +302,8 @@ |
||
302 | 302 | * @param \WebRequest $request |
303 | 303 | * @param string $key |
304 | 304 | * @param string $prefix |
305 | - * @param mixed $default |
|
306 | - * @return mixed |
|
305 | + * @param boolean $default |
|
306 | + * @return string |
|
307 | 307 | */ |
308 | 308 | protected function getCookie( $request, $key, $prefix, $default = null ) { |
309 | 309 | $value = $request->getCookie( $key, $prefix, $default ); |
@@ -2169,7 +2169,7 @@ discard block |
||
2169 | 2169 | * |
2170 | 2170 | * @param string $text |
2171 | 2171 | * |
2172 | - * @return string|bool Matching string or false |
|
2172 | + * @return string|false Matching string or false |
|
2173 | 2173 | */ |
2174 | 2174 | public static function matchSpamRegex( $text ) { |
2175 | 2175 | global $wgSpamRegex; |
@@ -2183,7 +2183,7 @@ discard block |
||
2183 | 2183 | * |
2184 | 2184 | * @param string $text |
2185 | 2185 | * |
2186 | - * @return string|bool Matching string or false |
|
2186 | + * @return string|false Matching string or false |
|
2187 | 2187 | */ |
2188 | 2188 | public static function matchSummarySpamRegex( $text ) { |
2189 | 2189 | global $wgSummarySpamRegex; |
@@ -2194,7 +2194,7 @@ discard block |
||
2194 | 2194 | /** |
2195 | 2195 | * @param string $text |
2196 | 2196 | * @param array $regexes |
2197 | - * @return bool|string |
|
2197 | + * @return string|false |
|
2198 | 2198 | */ |
2199 | 2199 | protected static function matchSpamRegexInternal( $text, $regexes ) { |
2200 | 2200 | foreach ( $regexes as $regex ) { |
@@ -2437,7 +2437,7 @@ discard block |
||
2437 | 2437 | * $this->allowNonTextContent to true to allow editing of non-textual |
2438 | 2438 | * content. |
2439 | 2439 | * |
2440 | - * @param string|null|bool $text Text to unserialize |
|
2440 | + * @param false|string $text Text to unserialize |
|
2441 | 2441 | * @return Content The content object created from $text. If $text was false |
2442 | 2442 | * or null, false resp. null will be returned instead. |
2443 | 2443 | * |
@@ -3128,6 +3128,10 @@ discard block |
||
3128 | 3128 | $this->showTextbox( $this->textbox2, 'wpTextbox2', array( 'tabindex' => 6, 'readonly' ) ); |
3129 | 3129 | } |
3130 | 3130 | |
3131 | + /** |
|
3132 | + * @param string $text |
|
3133 | + * @param string $name |
|
3134 | + */ |
|
3131 | 3135 | protected function showTextbox( $text, $name, $customAttribs = array() ) { |
3132 | 3136 | global $wgOut, $wgUser; |
3133 | 3137 | |
@@ -3157,6 +3161,9 @@ discard block |
||
3157 | 3161 | $wgOut->addHTML( Html::textarea( $name, $wikitext, $attribs ) ); |
3158 | 3162 | } |
3159 | 3163 | |
3164 | + /** |
|
3165 | + * @param string $previewOutput |
|
3166 | + */ |
|
3160 | 3167 | protected function displayPreviewArea( $previewOutput, $isOnTop = false ) { |
3161 | 3168 | global $wgOut; |
3162 | 3169 | $classes = array(); |
@@ -3740,7 +3747,7 @@ discard block |
||
3740 | 3747 | } |
3741 | 3748 | |
3742 | 3749 | /** |
3743 | - * @return array |
|
3750 | + * @return Title[] |
|
3744 | 3751 | */ |
3745 | 3752 | function getTemplates() { |
3746 | 3753 | if ( $this->preview || $this->section != '' ) { |
@@ -3763,7 +3770,7 @@ discard block |
||
3763 | 3770 | * Shows a bulletin board style toolbar for common editing functions. |
3764 | 3771 | * It can be disabled in the user preferences. |
3765 | 3772 | * |
3766 | - * @param $title Title object for the page being edited (optional) |
|
3773 | + * @param Title $title Title object for the page being edited (optional) |
|
3767 | 3774 | * @return string |
3768 | 3775 | */ |
3769 | 3776 | static function getEditToolbar( $title = null ) { |
@@ -3903,7 +3910,7 @@ discard block |
||
3903 | 3910 | * @param array $checked Array of checkbox => bool, where bool indicates the checked |
3904 | 3911 | * status of the checkbox |
3905 | 3912 | * |
3906 | - * @return array |
|
3913 | + * @return string |
|
3907 | 3914 | */ |
3908 | 3915 | public function getCheckboxes( &$tabindex, $checked ) { |
3909 | 3916 | global $wgUser, $wgUseMediaWikiUIEverywhere; |
@@ -3967,7 +3974,7 @@ discard block |
||
3967 | 3974 | * |
3968 | 3975 | * @param int $tabindex Current tabindex |
3969 | 3976 | * |
3970 | - * @return array |
|
3977 | + * @return string |
|
3971 | 3978 | */ |
3972 | 3979 | public function getEditButtons( &$tabindex ) { |
3973 | 3980 | $buttons = array(); |
@@ -85,6 +85,9 @@ discard block |
||
85 | 85 | unset( $this->db ); |
86 | 86 | } |
87 | 87 | |
88 | + /** |
|
89 | + * @param integer $row |
|
90 | + */ |
|
88 | 91 | public function seek( $row ) { |
89 | 92 | $this->cursor = min( $row, $this->nrows ); |
90 | 93 | } |
@@ -484,7 +487,7 @@ discard block |
||
484 | 487 | |
485 | 488 | /** |
486 | 489 | * This must be called after nextSequenceVal |
487 | - * @return null|int |
|
490 | + * @return integer |
|
488 | 491 | */ |
489 | 492 | function insertId() { |
490 | 493 | return $this->mInsertId; |
@@ -571,6 +574,9 @@ discard block |
||
571 | 574 | return $retVal; |
572 | 575 | } |
573 | 576 | |
577 | + /** |
|
578 | + * @param string $table |
|
579 | + */ |
|
574 | 580 | private function fieldBindStatement( $table, $col, &$val, $includeCol = false ) { |
575 | 581 | $col_info = $this->fieldInfoMulti( $table, $col ); |
576 | 582 | $col_type = $col_info != false ? $col_info->type() : 'CONSTANT'; |
@@ -812,6 +818,9 @@ discard block |
||
812 | 818 | return strtoupper( parent::tableName( $name, $format ) ); |
813 | 819 | } |
814 | 820 | |
821 | + /** |
|
822 | + * @param string $name |
|
823 | + */ |
|
815 | 824 | function tableNameInternal( $name ) { |
816 | 825 | $name = $this->tableName( $name ); |
817 | 826 | |
@@ -1269,6 +1278,9 @@ discard block |
||
1269 | 1278 | return "'" . $this->strencode( $s ) . "'"; |
1270 | 1279 | } |
1271 | 1280 | |
1281 | + /** |
|
1282 | + * @param string $s |
|
1283 | + */ |
|
1272 | 1284 | public function addIdentifierQuotes( $s ) { |
1273 | 1285 | if ( !$this->getFlag( DBO_DDLMODE ) ) { |
1274 | 1286 | $s = '/*Q*/' . $s; |
@@ -1332,7 +1344,7 @@ discard block |
||
1332 | 1344 | * |
1333 | 1345 | * @param array $options An associative array of options to be turned into |
1334 | 1346 | * an SQL query, valid keys are listed in the function. |
1335 | - * @return array |
|
1347 | + * @return string[] |
|
1336 | 1348 | */ |
1337 | 1349 | function makeSelectOptions( $options ) { |
1338 | 1350 | $preLimitTail = $postLimitTail = ''; |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | * @param string|bool $group Query group, or false for the generic reader |
233 | 233 | * @param string|bool $wiki Wiki ID, or false for the current wiki |
234 | 234 | * @throws MWException |
235 | - * @return bool|int|string |
|
235 | + * @return string |
|
236 | 236 | */ |
237 | 237 | public function getReaderIndex( $group = false, $wiki = false ) { |
238 | 238 | global $wgDBtype; |
@@ -437,7 +437,7 @@ discard block |
||
437 | 437 | * Returns false if there is no connection open |
438 | 438 | * |
439 | 439 | * @param int $i |
440 | - * @return DatabaseBase|bool False on failure |
|
440 | + * @return DatabaseBase|null False on failure |
|
441 | 441 | */ |
442 | 442 | public function getAnyOpenConnection( $i ) { |
443 | 443 | foreach ( $this->mConns as $conns ) { |
@@ -968,7 +968,7 @@ discard block |
||
968 | 968 | |
969 | 969 | /** |
970 | 970 | * Get the current master position for chronology control purposes |
971 | - * @return mixed |
|
971 | + * @return DBMasterPos |
|
972 | 972 | */ |
973 | 973 | public function getMasterPos() { |
974 | 974 | # If this entire request was served from a slave without opening a connection to the |
@@ -1289,7 +1289,7 @@ discard block |
||
1289 | 1289 | /** |
1290 | 1290 | * Call a function with each open connection object |
1291 | 1291 | * @param callable $callback |
1292 | - * @param array $params |
|
1292 | + * @param string[] $params |
|
1293 | 1293 | */ |
1294 | 1294 | public function forEachOpenConnection( $callback, array $params = [] ) { |
1295 | 1295 | foreach ( $this->mConns as $conns2 ) { |
@@ -1364,7 +1364,7 @@ discard block |
||
1364 | 1364 | * case on many installations. |
1365 | 1365 | * |
1366 | 1366 | * @param IDatabase $conn |
1367 | - * @return int|bool Returns false on error |
|
1367 | + * @return integer Returns false on error |
|
1368 | 1368 | */ |
1369 | 1369 | public function safeGetLag( IDatabase $conn ) { |
1370 | 1370 | if ( $this->getServerCount() == 1 ) { |
@@ -53,6 +53,9 @@ discard block |
||
53 | 53 | /** @var bool Whether interwiki transclusions are allowed */ |
54 | 54 | protected $mTrans; |
55 | 55 | |
56 | + /** |
|
57 | + * @param string $prefix |
|
58 | + */ |
|
56 | 59 | public function __construct( $prefix = null, $url = '', $api = '', $wikiId = '', $local = 0, |
57 | 60 | $trans = 0 |
58 | 61 | ) { |
@@ -192,6 +195,9 @@ discard block |
||
192 | 195 | return $value; |
193 | 196 | } |
194 | 197 | |
198 | + /** |
|
199 | + * @return string |
|
200 | + */ |
|
195 | 201 | private static function getCacheValue( $key ) { |
196 | 202 | global $wgInterwikiCache; |
197 | 203 | static $reader; |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | /** |
56 | 56 | * Constructor from a page id |
57 | 57 | * @param int $id Article ID to load |
58 | - * @return ImagePage|null |
|
58 | + * @return ImagePage |
|
59 | 59 | */ |
60 | 60 | public static function newFromID( $id ) { |
61 | 61 | $t = Title::newFromID( $id ); |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | * |
267 | 267 | * @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata(). |
268 | 268 | * |
269 | - * @param array $metadata The array containing the Exif data |
|
269 | + * @param boolean $metadata The array containing the Exif data |
|
270 | 270 | * @return string The metadata table. This is treated as Wikitext (!) |
271 | 271 | */ |
272 | 272 | protected function makeMetadataTable( $metadata ) { |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | * |
296 | 296 | * Omit noarticletext if sharedupload; text will be fetched from the |
297 | 297 | * shared upload server if possible. |
298 | - * @return string |
|
298 | + * @return null|Content |
|
299 | 299 | */ |
300 | 300 | public function getContentObject() { |
301 | 301 | $this->loadFile(); |
@@ -636,7 +636,7 @@ discard block |
||
636 | 636 | * Make the text under the image to say what size preview |
637 | 637 | * |
638 | 638 | * @param $params Array parameters for thumbnail |
639 | - * @param $sizeLinkBigImagePreview HTML for the current size |
|
639 | + * @param string $sizeLinkBigImagePreview HTML for the current size |
|
640 | 640 | * @return string HTML output |
641 | 641 | */ |
642 | 642 | private function getThumbPrevText( $params, $sizeLinkBigImagePreview ) { |
@@ -1211,7 +1211,7 @@ discard block |
||
1211 | 1211 | |
1212 | 1212 | /** |
1213 | 1213 | * @see WikiFilePage::getFile |
1214 | - * @return bool|File |
|
1214 | + * @return File |
|
1215 | 1215 | */ |
1216 | 1216 | public function getFile() { |
1217 | 1217 | return $this->mPage->getFile(); |