@@ -94,7 +94,7 @@ |
||
94 | 94 | /** |
95 | 95 | * @param array $list |
96 | 96 | * @param array $path |
97 | - * @param mixed $item |
|
97 | + * @param License $item |
|
98 | 98 | */ |
99 | 99 | protected function stackItem( &$list, $path, $item ) { |
100 | 100 | $position =& $list; |
@@ -706,7 +706,7 @@ discard block |
||
706 | 706 | /** |
707 | 707 | * Make HTML for a thumbnail including image, border and caption |
708 | 708 | * @param Title $title |
709 | - * @param File|bool $file File object or false if it doesn't exist |
|
709 | + * @param File $file File object or false if it doesn't exist |
|
710 | 710 | * @param string $label |
711 | 711 | * @param string $alt |
712 | 712 | * @param string $align |
@@ -1268,7 +1268,7 @@ discard block |
||
1268 | 1268 | * @param string|null $wikiId Id (as used by WikiMap) of the wiki to generate links to. |
1269 | 1269 | * For use with external changes. |
1270 | 1270 | * |
1271 | - * @return mixed|string |
|
1271 | + * @return string |
|
1272 | 1272 | */ |
1273 | 1273 | public static function formatComment( |
1274 | 1274 | $comment, $title = null, $local = false, $wikiId = null |
@@ -1494,7 +1494,7 @@ discard block |
||
1494 | 1494 | * @param string $text |
1495 | 1495 | * @param string|null $wikiId Id of the wiki to link to (if not the local wiki), |
1496 | 1496 | * as used by WikiMap. |
1497 | - * @param string|string[] $options See the $options parameter in Linker::link. |
|
1497 | + * @param string $options See the $options parameter in Linker::link. |
|
1498 | 1498 | * |
1499 | 1499 | * @return string HTML link |
1500 | 1500 | */ |
@@ -1736,7 +1736,7 @@ discard block |
||
1736 | 1736 | * Generate a table of contents from a section tree. |
1737 | 1737 | * |
1738 | 1738 | * @param array $tree Return value of ParserOutput::getSections() |
1739 | - * @param string|Language|bool $lang Language for the toc title, defaults to user language |
|
1739 | + * @param Language $lang Language for the toc title, defaults to user language |
|
1740 | 1740 | * @return string HTML fragment |
1741 | 1741 | */ |
1742 | 1742 | public static function generateTOC( $tree, $lang = false ) { |
@@ -1793,7 +1793,7 @@ discard block |
||
1793 | 1793 | * Split a link trail, return the "inside" portion and the remainder of the trail |
1794 | 1794 | * as a two-element array |
1795 | 1795 | * @param string $trail |
1796 | - * @return array |
|
1796 | + * @return string[] |
|
1797 | 1797 | */ |
1798 | 1798 | static function splitTrail( $trail ) { |
1799 | 1799 | global $wgContLang; |
@@ -1831,7 +1831,7 @@ discard block |
||
1831 | 1831 | * |
1832 | 1832 | * @param Revision $rev |
1833 | 1833 | * @param IContextSource $context Context to use or null for the main context. |
1834 | - * @param array $options |
|
1834 | + * @param string[] $options |
|
1835 | 1835 | * @return string |
1836 | 1836 | */ |
1837 | 1837 | public static function generateRollback( $rev, IContextSource $context = null, |
@@ -2013,7 +2013,7 @@ discard block |
||
2013 | 2013 | * @param array $templates Array of templates from Article::getUsedTemplate or similar |
2014 | 2014 | * @param bool $preview Whether this is for a preview |
2015 | 2015 | * @param bool $section Whether this is for a section edit |
2016 | - * @param Title|Message|string|null $more An escaped link for "More..." of the templates |
|
2016 | + * @param string|null $more An escaped link for "More..." of the templates |
|
2017 | 2017 | * @return string HTML output |
2018 | 2018 | */ |
2019 | 2019 | public static function formatTemplates( $templates, $preview = false, |
@@ -413,8 +413,8 @@ discard block |
||
413 | 413 | |
414 | 414 | /** |
415 | 415 | * @param stdClass $row Row |
416 | - * @param string|array $type |
|
417 | - * @param string|array $action |
|
416 | + * @param string[] $type |
|
417 | + * @param string $action |
|
418 | 418 | * @param string $right |
419 | 419 | * @return bool |
420 | 420 | */ |
@@ -649,7 +649,7 @@ discard block |
||
649 | 649 | * @param IDatabase $db |
650 | 650 | * @param string $audience Public/user |
651 | 651 | * @param User $user User to check, or null to use $wgUser |
652 | - * @return string|bool String on success, false on failure. |
|
652 | + * @return string|false String on success, false on failure. |
|
653 | 653 | */ |
654 | 654 | public static function getExcludeClause( $db, $audience = 'public', User $user = null ) { |
655 | 655 | global $wgLogRestrictions; |
@@ -423,7 +423,7 @@ |
||
423 | 423 | * Returns a sentence describing the log action. Usually |
424 | 424 | * a Message object is returned, but old style log types |
425 | 425 | * and entries might return pre-escaped HTML string. |
426 | - * @return Message|string Pre-escaped HTML |
|
426 | + * @return Message Pre-escaped HTML |
|
427 | 427 | */ |
428 | 428 | protected function getActionMessage() { |
429 | 429 | $message = $this->msg( $this->getMessageKey() ); |
@@ -474,7 +474,7 @@ |
||
474 | 474 | * |
475 | 475 | * @param User $watchingUser |
476 | 476 | * @param string $source |
477 | - * @return bool |
|
477 | + * @return Status |
|
478 | 478 | * @private |
479 | 479 | */ |
480 | 480 | function sendPersonalised( $watchingUser, $source ) { |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * |
35 | 35 | * @param string $dstPath |
36 | 36 | * @param bool $checkDstPath |
37 | - * @return string|Callable One of client, im, custom, gd, imext or an array( object, method ) |
|
37 | + * @return string One of client, im, custom, gd, imext or an array( object, method ) |
|
38 | 38 | */ |
39 | 39 | protected function getScalerType( $dstPath, $checkDstPath = true ) { |
40 | 40 | global $wgUseImageResize, $wgUseImageMagick, $wgCustomConvertCommand; |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | * Get metadata, unserializing it if neccessary. |
256 | 256 | * |
257 | 257 | * @param File $file The DjVu file in question |
258 | - * @return string XML metadata as a string. |
|
258 | + * @return boolean XML metadata as a string. |
|
259 | 259 | * @throws MWException |
260 | 260 | */ |
261 | 261 | private function getUnserializedMetadata( File $file ) { |
@@ -371,6 +371,10 @@ discard block |
||
371 | 371 | return 'djvuxml'; |
372 | 372 | } |
373 | 373 | |
374 | + /** |
|
375 | + * @param File $image |
|
376 | + * @param boolean $metadata |
|
377 | + */ |
|
374 | 378 | function isMetadataValid( $image, $metadata ) { |
375 | 379 | return !empty( $metadata ) && $metadata != serialize( array() ); |
376 | 380 | } |
@@ -94,6 +94,11 @@ discard block |
||
94 | 94 | fclose( $file ); |
95 | 95 | } |
96 | 96 | |
97 | + /** |
|
98 | + * @param resource $file |
|
99 | + * @param string $length |
|
100 | + * @param integer $indent |
|
101 | + */ |
|
97 | 102 | private function dumpForm( $file, $length, $indent ) { |
98 | 103 | $start = ftell( $file ); |
99 | 104 | $secondary = fread( $file, 4 ); |
@@ -187,6 +192,10 @@ discard block |
||
187 | 192 | } |
188 | 193 | } |
189 | 194 | |
195 | + /** |
|
196 | + * @param resource $file |
|
197 | + * @param string $formLength |
|
198 | + */ |
|
190 | 199 | private function getMultiPageInfo( $file, $formLength ) { |
191 | 200 | // For now, we'll just look for the first page in the file |
192 | 201 | // and report its information, hoping others are the same size. |
@@ -390,6 +399,9 @@ discard block |
||
390 | 399 | return $xml; |
391 | 400 | } |
392 | 401 | |
402 | + /** |
|
403 | + * @param string $line |
|
404 | + */ |
|
393 | 405 | function parseFormDjvu( $line, &$xml ) { |
394 | 406 | $parentLevel = strspn( $line, ' ' ); |
395 | 407 | $line = strtok( "\n" ); |
@@ -82,7 +82,7 @@ |
||
82 | 82 | |
83 | 83 | /** |
84 | 84 | * @param File $image |
85 | - * @param array $metadata |
|
85 | + * @param boolean $metadata |
|
86 | 86 | * @return bool|int |
87 | 87 | */ |
88 | 88 | function isMetadataValid( $image, $metadata ) { |