@@ -1230,8 +1230,8 @@ discard block |
||
| 1230 | 1230 | * numbers, joins arrays of numbers with commas. |
| 1231 | 1231 | * |
| 1232 | 1232 | * @param mixed $num The value to format |
| 1233 | - * @param float|int|bool $round Digits to round to or false. |
|
| 1234 | - * @return mixed A floating point number or whatever we were fed |
|
| 1233 | + * @param integer $round Digits to round to or false. |
|
| 1234 | + * @return string|null A floating point number or whatever we were fed |
|
| 1235 | 1235 | */ |
| 1236 | 1236 | private function formatNum( $num, $round = false ) { |
| 1237 | 1237 | $m = array(); |
@@ -1396,7 +1396,7 @@ discard block |
||
| 1396 | 1396 | * |
| 1397 | 1397 | * @param int $coord Degrees, minutes and seconds |
| 1398 | 1398 | * @param string $type Latitude or longitude (for if its a NWS or E) |
| 1399 | - * @return mixed A floating point number or whatever we were fed |
|
| 1399 | + * @return string A floating point number or whatever we were fed |
|
| 1400 | 1400 | */ |
| 1401 | 1401 | private function formatCoords( $coord, $type ) { |
| 1402 | 1402 | $ref = ''; |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | * and those can't extract xmp on files containing both exif and xmp data |
| 45 | 45 | * |
| 46 | 46 | * @param string $filename Name of jpeg file |
| 47 | - * @return array Array of interesting segments. |
|
| 47 | + * @return string Array of interesting segments. |
|
| 48 | 48 | * @throws MWException If given invalid file. |
| 49 | 49 | */ |
| 50 | 50 | static function segmentSplitter( $filename ) { |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | * |
| 197 | 197 | * @note This method is currently unused. |
| 198 | 198 | * @param File $image |
| 199 | - * @return string |
|
| 199 | + * @return boolean |
|
| 200 | 200 | */ |
| 201 | 201 | function getMetadataType( $image ) { |
| 202 | 202 | return false; |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | * this interface, it should return an empty array, not false. |
| 252 | 252 | * |
| 253 | 253 | * @param File $file |
| 254 | - * @return array|bool False if interface not supported |
|
| 254 | + * @return boolean False if interface not supported |
|
| 255 | 255 | * @since 1.23 |
| 256 | 256 | */ |
| 257 | 257 | public function getCommonMetaArray( File $file ) { |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | * @param File $image |
| 269 | 269 | * @param string $script |
| 270 | 270 | * @param array $params |
| 271 | - * @return bool|ThumbnailImage |
|
| 271 | + * @return boolean |
|
| 272 | 272 | */ |
| 273 | 273 | function getScriptedTransform( $image, $script, $params ) { |
| 274 | 274 | return false; |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | * @param string $ext Extension of original file |
| 309 | 309 | * @param string $mime MIME type of original file |
| 310 | 310 | * @param array $params Handler specific rendering parameters |
| 311 | - * @return array Thumbnail extension and MIME type |
|
| 311 | + * @return string[] Thumbnail extension and MIME type |
|
| 312 | 312 | */ |
| 313 | 313 | function getThumbType( $ext, $mime, $params = null ) { |
| 314 | 314 | $magic = MimeMagic::singleton(); |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | * Currently overloaded by PDF and DjVu handlers |
| 452 | 452 | * @param File $image |
| 453 | 453 | * @param int $page Page number to get information for |
| 454 | - * @return bool|string Page text or false when no text found or if |
|
| 454 | + * @return boolean Page text or false when no text found or if |
|
| 455 | 455 | * unsupported. |
| 456 | 456 | */ |
| 457 | 457 | function getPageText( File $image, $page ) { |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | * indication of grouped and chained streams in ogg container files. |
| 509 | 509 | * @param File $image |
| 510 | 510 | * @param bool|IContextSource $context Context to use (optional) |
| 511 | - * @return array|bool |
|
| 511 | + * @return boolean |
|
| 512 | 512 | */ |
| 513 | 513 | function formatMetadata( $image, $context = false ) { |
| 514 | 514 | return false; |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | * @param int $boxWidth Width of the thumbnail box. |
| 649 | 649 | * @param int $boxHeight Height of the thumbnail box. |
| 650 | 650 | * @param int $maxHeight Maximum height expected for the thumbnail. |
| 651 | - * @return int |
|
| 651 | + * @return double |
|
| 652 | 652 | */ |
| 653 | 653 | public static function fitBoxWidth( $boxWidth, $boxHeight, $maxHeight ) { |
| 654 | 654 | $idealWidth = $boxWidth * $maxHeight / $boxHeight; |
@@ -80,14 +80,14 @@ discard block |
||
| 80 | 80 | /** |
| 81 | 81 | * Get the final extension of the thumbnail. |
| 82 | 82 | * Returns false for scripted transformations. |
| 83 | - * @return string|bool |
|
| 83 | + * @return string|false |
|
| 84 | 84 | */ |
| 85 | 85 | public function getExtension() { |
| 86 | 86 | return $this->path ? FileBackend::extensionFromPath( $this->path ) : false; |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | - * @return string|bool The thumbnail URL |
|
| 90 | + * @return string The thumbnail URL |
|
| 91 | 91 | */ |
| 92 | 92 | public function getUrl() { |
| 93 | 93 | return $this->url; |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | * |
| 215 | 215 | * @deprecated since 1.26, use streamFileWithStatus |
| 216 | 216 | * @param array $headers Additional HTTP headers to send on success |
| 217 | - * @return bool Success |
|
| 217 | + * @return boolean|null Success |
|
| 218 | 218 | */ |
| 219 | 219 | public function streamFile( $headers = array() ) { |
| 220 | 220 | $this->streamFileWithStatus( $headers )->isOK(); |
@@ -443,6 +443,9 @@ discard block |
||
| 443 | 443 | /** @var string Plain text formatted version of the error */ |
| 444 | 444 | private $textMsg; |
| 445 | 445 | |
| 446 | + /** |
|
| 447 | + * @param string $msg |
|
| 448 | + */ |
|
| 446 | 449 | function __construct( $msg, $width, $height /*, ... */ ) { |
| 447 | 450 | $args = array_slice( func_get_args(), 3 ); |
| 448 | 451 | $htmlArgs = array_map( 'htmlspecialchars', $args ); |
@@ -29,6 +29,10 @@ discard block |
||
| 29 | 29 | * @ingroup Media |
| 30 | 30 | */ |
| 31 | 31 | class SVGMetadataExtractor { |
| 32 | + |
|
| 33 | + /** |
|
| 34 | + * @param string $filename |
|
| 35 | + */ |
|
| 32 | 36 | static function getMetadata( $filename ) { |
| 33 | 37 | $svg = new SVGReader( $filename ); |
| 34 | 38 | |
@@ -372,7 +376,7 @@ discard block |
||
| 372 | 376 | * http://www.w3.org/TR/SVG11/coords.html#UnitIdentifiers |
| 373 | 377 | * |
| 374 | 378 | * @param string $length CSS/SVG length. |
| 375 | - * @param float|int $viewportSize Optional scale for percentage units... |
|
| 379 | + * @param integer $viewportSize Optional scale for percentage units... |
|
| 376 | 380 | * @return float Length in pixels |
| 377 | 381 | */ |
| 378 | 382 | static function scaleSVGUnit( $length, $viewportSize = 512 ) { |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | /** |
| 288 | 288 | * Get the source file for the transform |
| 289 | 289 | * |
| 290 | - * @param $file File |
|
| 290 | + * @param File $file File |
|
| 291 | 291 | * @param $params Array |
| 292 | 292 | * @return Array Array with keys width, height and path. |
| 293 | 293 | */ |
@@ -562,7 +562,7 @@ discard block |
||
| 562 | 562 | * @param array $params Rotate parameters. |
| 563 | 563 | * 'rotation' clockwise rotation in degrees, allowed are multiples of 90 |
| 564 | 564 | * @since 1.24 Is non-static. From 1.21 it was static |
| 565 | - * @return bool |
|
| 565 | + * @return MediaTransformError |
|
| 566 | 566 | */ |
| 567 | 567 | public function rotate( $file, $params ) { |
| 568 | 568 | return new MediaTransformError( 'thumbnail_error', 0, 0, |
@@ -43,6 +43,9 @@ discard block |
||
| 43 | 43 | const VP8X_XMP = 4; |
| 44 | 44 | const VP8X_ANIM = 2; |
| 45 | 45 | |
| 46 | + /** |
|
| 47 | + * @param string $filename |
|
| 48 | + */ |
|
| 46 | 49 | public function getMetadata( $image, $filename ) { |
| 47 | 50 | $parsedWebPData = self::extractMetadata( $filename ); |
| 48 | 51 | if ( !$parsedWebPData ) { |
@@ -86,7 +89,6 @@ discard block |
||
| 86 | 89 | /** |
| 87 | 90 | * Extracts the image size and WebP type from a file |
| 88 | 91 | * |
| 89 | - * @param string $chunks Chunks as extracted by RiffExtractor |
|
| 90 | 92 | * @return array|bool Header data array with entries 'compression', 'width' and 'height', |
| 91 | 93 | * where 'compression' can be 'lossy', 'lossless', 'animated' or 'unknown'. False if |
| 92 | 94 | * file is not a valid WebP file. |
@@ -289,7 +291,7 @@ discard block |
||
| 289 | 291 | * @param $ext |
| 290 | 292 | * @param $mime |
| 291 | 293 | * @param $params |
| 292 | - * @return array |
|
| 294 | + * @return string[] |
|
| 293 | 295 | */ |
| 294 | 296 | public function getThumbType( $ext, $mime, $params = null ) { |
| 295 | 297 | return array( 'png', 'image/png' ); |
@@ -491,7 +491,7 @@ |
||
| 491 | 491 | * <exif:DigitalZoomRatio>0/10</exif:DigitalZoomRatio> |
| 492 | 492 | * and are processing the 0/10 bit. |
| 493 | 493 | * |
| 494 | - * @param XMLParser $parser XMLParser reference to the xml parser |
|
| 494 | + * @param resource $parser XMLParser reference to the xml parser |
|
| 495 | 495 | * @param string $data Character data |
| 496 | 496 | * @throws RuntimeException On invalid data |
| 497 | 497 | */ |
@@ -374,7 +374,6 @@ discard block |
||
| 374 | 374 | * @since 1.17 |
| 375 | 375 | * |
| 376 | 376 | * @param string|string[]|MessageSpecifier $key |
| 377 | - * @param mixed $param,... Parameters as strings. |
|
| 378 | 377 | * |
| 379 | 378 | * @return Message |
| 380 | 379 | */ |
@@ -391,8 +390,6 @@ discard block |
||
| 391 | 390 | * |
| 392 | 391 | * @since 1.18 |
| 393 | 392 | * |
| 394 | - * @param string|string[] $keys,... Message keys, or first argument as an array of all the |
|
| 395 | - * message keys. |
|
| 396 | 393 | * |
| 397 | 394 | * @return Message |
| 398 | 395 | */ |
@@ -463,8 +460,6 @@ discard block |
||
| 463 | 460 | * |
| 464 | 461 | * @since 1.17 |
| 465 | 462 | * |
| 466 | - * @param mixed $params,... Raw parameters as strings, or a single argument that is |
|
| 467 | - * an array of raw parameters. |
|
| 468 | 463 | * |
| 469 | 464 | * @return Message $this |
| 470 | 465 | */ |
@@ -485,8 +480,6 @@ discard block |
||
| 485 | 480 | * |
| 486 | 481 | * @since 1.18 |
| 487 | 482 | * |
| 488 | - * @param mixed $param,... Numeric parameters, or a single argument that is |
|
| 489 | - * an array of numeric parameters. |
|
| 490 | 483 | * |
| 491 | 484 | * @return Message $this |
| 492 | 485 | */ |
@@ -507,8 +500,6 @@ discard block |
||
| 507 | 500 | * |
| 508 | 501 | * @since 1.22 |
| 509 | 502 | * |
| 510 | - * @param int|int[] $param,... Duration parameters, or a single argument that is |
|
| 511 | - * an array of duration parameters. |
|
| 512 | 503 | * |
| 513 | 504 | * @return Message $this |
| 514 | 505 | */ |
@@ -529,8 +520,6 @@ discard block |
||
| 529 | 520 | * |
| 530 | 521 | * @since 1.22 |
| 531 | 522 | * |
| 532 | - * @param string|string[] $param,... Expiry parameters, or a single argument that is |
|
| 533 | - * an array of expiry parameters. |
|
| 534 | 523 | * |
| 535 | 524 | * @return Message $this |
| 536 | 525 | */ |
@@ -551,8 +540,6 @@ discard block |
||
| 551 | 540 | * |
| 552 | 541 | * @since 1.22 |
| 553 | 542 | * |
| 554 | - * @param int|int[] $param,... Time period parameters, or a single argument that is |
|
| 555 | - * an array of time period parameters. |
|
| 556 | 543 | * |
| 557 | 544 | * @return Message $this |
| 558 | 545 | */ |
@@ -573,8 +560,6 @@ discard block |
||
| 573 | 560 | * |
| 574 | 561 | * @since 1.22 |
| 575 | 562 | * |
| 576 | - * @param int|int[] $param,... Size parameters, or a single argument that is |
|
| 577 | - * an array of size parameters. |
|
| 578 | 563 | * |
| 579 | 564 | * @return Message $this |
| 580 | 565 | */ |
@@ -595,8 +580,6 @@ discard block |
||
| 595 | 580 | * |
| 596 | 581 | * @since 1.22 |
| 597 | 582 | * |
| 598 | - * @param int|int[] $param,... Bit rate parameters, or a single argument that is |
|
| 599 | - * an array of bit rate parameters. |
|
| 600 | 583 | * |
| 601 | 584 | * @return Message $this |
| 602 | 585 | */ |
@@ -619,8 +602,6 @@ discard block |
||
| 619 | 602 | * |
| 620 | 603 | * @since 1.25 |
| 621 | 604 | * |
| 622 | - * @param string|string[] $param,... plaintext parameters, or a single argument that is |
|
| 623 | - * an array of plaintext parameters. |
|
| 624 | 605 | * |
| 625 | 606 | * @return Message $this |
| 626 | 607 | */ |