@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | * Return an array of conditions depending of options set in $opts |
| 174 | 174 | * |
| 175 | 175 | * @param FormOptions $opts |
| 176 | - * @return array |
|
| 176 | + * @return string[] |
|
| 177 | 177 | */ |
| 178 | 178 | public function buildMainQueryConds( FormOptions $opts ) { |
| 179 | 179 | $dbr = $this->getDB(); |
@@ -535,7 +535,7 @@ discard block |
||
| 535 | 535 | * Creates the choose namespace selection |
| 536 | 536 | * |
| 537 | 537 | * @param FormOptions $opts |
| 538 | - * @return string |
|
| 538 | + * @return string[] |
|
| 539 | 539 | */ |
| 540 | 540 | protected function namespaceFilterForm( FormOptions $opts ) { |
| 541 | 541 | $nsSelect = Html::namespaceSelector( |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | * Create an input to filter changes by categories |
| 562 | 562 | * |
| 563 | 563 | * @param FormOptions $opts |
| 564 | - * @return array |
|
| 564 | + * @return string[] |
|
| 565 | 565 | */ |
| 566 | 566 | protected function categoryFilterForm( FormOptions $opts ) { |
| 567 | 567 | list( $label, $input ) = Xml::inputLabelSep( $this->msg( 'rc_categories' )->text(), |
@@ -889,7 +889,7 @@ discard block |
||
| 889 | 889 | /** |
| 890 | 890 | * Show results from other wikis |
| 891 | 891 | * |
| 892 | - * @param SearchResultSet|array $matches |
|
| 892 | + * @param SearchResultSet|null $matches |
|
| 893 | 893 | * @param string $query |
| 894 | 894 | * |
| 895 | 895 | * @return string |
@@ -1348,7 +1348,7 @@ discard block |
||
| 1348 | 1348 | * @since 1.18 |
| 1349 | 1349 | * |
| 1350 | 1350 | * @param string $key |
| 1351 | - * @param mixed $value |
|
| 1351 | + * @param string $value |
|
| 1352 | 1352 | */ |
| 1353 | 1353 | public function setExtraParam( $key, $value ) { |
| 1354 | 1354 | $this->extraParams[$key] = $value; |
@@ -170,6 +170,10 @@ discard block |
||
| 170 | 170 | ) ); |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | + /** |
|
| 174 | + * @param boolean $showActions |
|
| 175 | + * @param boolean $showEditLinks |
|
| 176 | + */ |
|
| 173 | 177 | function doTagRow( $tag, $hitcount, $showActions, $showEditLinks ) { |
| 174 | 178 | $newRow = ''; |
| 175 | 179 | $newRow .= Xml::tags( 'td', null, Xml::element( 'code', null, $tag ) ); |
@@ -317,6 +321,9 @@ discard block |
||
| 317 | 321 | } |
| 318 | 322 | } |
| 319 | 323 | |
| 324 | + /** |
|
| 325 | + * @param null|string $tag |
|
| 326 | + */ |
|
| 320 | 327 | protected function showDeleteTagForm( $tag ) { |
| 321 | 328 | $user = $this->getUser(); |
| 322 | 329 | if ( !$user->isAllowed( 'managechangetags' ) ) { |
@@ -375,6 +382,10 @@ discard block |
||
| 375 | 382 | $form->show(); |
| 376 | 383 | } |
| 377 | 384 | |
| 385 | + /** |
|
| 386 | + * @param null|string $tag |
|
| 387 | + * @param boolean $activate |
|
| 388 | + */ |
|
| 378 | 389 | protected function showActivateDeactivateForm( $tag, $activate ) { |
| 379 | 390 | $actionStr = $activate ? 'activate' : 'deactivate'; |
| 380 | 391 | |
@@ -39,6 +39,9 @@ discard block |
||
| 39 | 39 | /** @var Config */ |
| 40 | 40 | protected $config; |
| 41 | 41 | |
| 42 | + /** |
|
| 43 | + * @param null|Title $title |
|
| 44 | + */ |
|
| 42 | 45 | function __construct( $title, Config $config = null ) { |
| 43 | 46 | if ( is_null( $title ) ) { |
| 44 | 47 | throw new MWException( __METHOD__ . ' given a null title.' ); |
@@ -913,6 +916,9 @@ discard block |
||
| 913 | 916 | return true; |
| 914 | 917 | } |
| 915 | 918 | |
| 919 | + /** |
|
| 920 | + * @param string|boolean $timestamp |
|
| 921 | + */ |
|
| 916 | 922 | private function showRevision( $timestamp ) { |
| 917 | 923 | if ( !preg_match( '/[0-9]{14}/', $timestamp ) ) { |
| 918 | 924 | return; |
@@ -1388,6 +1394,10 @@ discard block |
||
| 1388 | 1394 | return true; |
| 1389 | 1395 | } |
| 1390 | 1396 | |
| 1397 | + /** |
|
| 1398 | + * @param string|null $earliestLiveTime |
|
| 1399 | + * @param integer $remaining |
|
| 1400 | + */ |
|
| 1391 | 1401 | protected function formatRevisionRow( $row, $earliestLiveTime, $remaining ) { |
| 1392 | 1402 | $rev = Revision::newFromArchiveRow( $row, |
| 1393 | 1403 | array( |
@@ -1563,7 +1573,7 @@ discard block |
||
| 1563 | 1573 | /** |
| 1564 | 1574 | * Fetch image view link if it's available to all users |
| 1565 | 1575 | * |
| 1566 | - * @param File|ArchivedFile $file |
|
| 1576 | + * @param ArchivedFile $file |
|
| 1567 | 1577 | * @param Title $titleObj |
| 1568 | 1578 | * @param string $ts A timestamp |
| 1569 | 1579 | * @param string $key A storage key |
@@ -1599,7 +1609,7 @@ discard block |
||
| 1599 | 1609 | /** |
| 1600 | 1610 | * Fetch file's user id if it's available to this user |
| 1601 | 1611 | * |
| 1602 | - * @param File|ArchivedFile $file |
|
| 1612 | + * @param ArchivedFile $file |
|
| 1603 | 1613 | * @return string HTML fragment |
| 1604 | 1614 | */ |
| 1605 | 1615 | function getFileUser( $file ) { |
@@ -1622,7 +1632,7 @@ discard block |
||
| 1622 | 1632 | /** |
| 1623 | 1633 | * Fetch file upload comment if it's available to this user |
| 1624 | 1634 | * |
| 1625 | - * @param File|ArchivedFile $file |
|
| 1635 | + * @param ArchivedFile $file |
|
| 1626 | 1636 | * @return string HTML fragment |
| 1627 | 1637 | */ |
| 1628 | 1638 | function getFileComment( $file ) { |
@@ -214,7 +214,7 @@ |
||
| 214 | 214 | /** |
| 215 | 215 | * Show the main upload form |
| 216 | 216 | * |
| 217 | - * @param HTMLForm|string $form An HTMLForm instance or HTML string to show |
|
| 217 | + * @param UploadForm $form An HTMLForm instance or HTML string to show |
|
| 218 | 218 | */ |
| 219 | 219 | protected function showUploadForm( $form ) { |
| 220 | 220 | # Add links if file was previously deleted |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | * |
| 58 | 58 | * @param string $subPage Subpage, e.g. in |
| 59 | 59 | * http://example.com/wiki/Special:UploadStash/foo.jpg, the "foo.jpg" part |
| 60 | - * @return bool Success |
|
| 60 | + * @return boolean|null Success |
|
| 61 | 61 | */ |
| 62 | 62 | public function execute( $subPage ) { |
| 63 | 63 | $this->useTransactionalTimeLimit(); |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | * |
| 79 | 79 | * @param string $key The key of a particular requested file |
| 80 | 80 | * @throws HttpError |
| 81 | - * @return bool |
|
| 81 | + * @return boolean|null |
|
| 82 | 82 | */ |
| 83 | 83 | public function showUpload( $key ) { |
| 84 | 84 | // prevent callers from doing standard HTML output -- we'll take it from here |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * @param File $file |
| 158 | 158 | * @param array $params |
| 159 | 159 | * |
| 160 | - * @return bool Success |
|
| 160 | + * @return boolean|null Success |
|
| 161 | 161 | */ |
| 162 | 162 | private function outputThumbFromStash( $file, $params ) { |
| 163 | 163 | $flags = 0; |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | /** |
| 137 | 137 | * Returns an array of all valid error messages. |
| 138 | 138 | * |
| 139 | - * @return array |
|
| 139 | + * @return string[] |
|
| 140 | 140 | */ |
| 141 | 141 | public static function getValidErrorMessages() { |
| 142 | 142 | static $messages = null; |
@@ -1222,7 +1222,7 @@ discard block |
||
| 1222 | 1222 | * Display a "successful action" page. |
| 1223 | 1223 | * |
| 1224 | 1224 | * @param string $type Condition of return to; see `executeReturnTo` |
| 1225 | - * @param string|Message $title Page's title |
|
| 1225 | + * @param Message $title Page's title |
|
| 1226 | 1226 | * @param string $msgname |
| 1227 | 1227 | * @param string $injected_html |
| 1228 | 1228 | */ |
@@ -1735,7 +1735,7 @@ discard block |
||
| 1735 | 1735 | * Private function to check password expiration, until AuthManager comes |
| 1736 | 1736 | * along to handle that. |
| 1737 | 1737 | * @param User $user |
| 1738 | - * @return string|bool |
|
| 1738 | + * @return string|false |
|
| 1739 | 1739 | */ |
| 1740 | 1740 | private function checkUserPasswordExpired( User $user ) { |
| 1741 | 1741 | global $wgPasswordExpireGrace; |
@@ -308,7 +308,7 @@ |
||
| 308 | 308 | * @param User $user |
| 309 | 309 | * @param array $oldGroups |
| 310 | 310 | * @param array $newGroups |
| 311 | - * @param array $reason |
|
| 311 | + * @param string $reason |
|
| 312 | 312 | */ |
| 313 | 313 | function addLogEntry( $user, $oldGroups, $newGroups, $reason ) { |
| 314 | 314 | $logEntry = new ManualLogEntry( 'rights', 'rights' ); |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | |
| 361 | 361 | /** |
| 362 | 362 | * @since 1.22 Returns the HEAD date in addition to the sha1 and link |
| 363 | - * @return bool|string Global wgVersion + HEAD sha1 stripped to the first 7 chars |
|
| 363 | + * @return false|string Global wgVersion + HEAD sha1 stripped to the first 7 chars |
|
| 364 | 364 | * with link and date, or false on failure |
| 365 | 365 | */ |
| 366 | 366 | private static function getVersionLinkedGit() { |
@@ -934,6 +934,10 @@ discard block |
||
| 934 | 934 | } |
| 935 | 935 | } |
| 936 | 936 | |
| 937 | + /** |
|
| 938 | + * @param string $text |
|
| 939 | + * @param string $name |
|
| 940 | + */ |
|
| 937 | 941 | private function openExtType( $text = null, $name = null ) { |
| 938 | 942 | $out = ''; |
| 939 | 943 | |
@@ -1052,7 +1056,7 @@ discard block |
||
| 1052 | 1056 | * |
| 1053 | 1057 | * @since 1.23 |
| 1054 | 1058 | * |
| 1055 | - * @return bool|string False if no such file exists, otherwise returns |
|
| 1059 | + * @return false|string False if no such file exists, otherwise returns |
|
| 1056 | 1060 | * a path to it. |
| 1057 | 1061 | */ |
| 1058 | 1062 | public static function getExtAuthorsFileName( $extDir ) { |
@@ -1081,7 +1085,7 @@ discard block |
||
| 1081 | 1085 | * |
| 1082 | 1086 | * @since 1.23 |
| 1083 | 1087 | * |
| 1084 | - * @return bool|string False if no such file exists, otherwise returns |
|
| 1088 | + * @return false|string False if no such file exists, otherwise returns |
|
| 1085 | 1089 | * a path to it. |
| 1086 | 1090 | */ |
| 1087 | 1091 | public static function getExtLicenseFileName( $extDir ) { |