@@ -183,7 +183,7 @@ |
||
183 | 183 | * given $bootstrapConfig. In particular, all wiring files defined in the |
184 | 184 | * ServiceWiringFiles setting are loaded, and the MediaWikiServices hook is called. |
185 | 185 | * |
186 | - * @param Config|null $bootstrapConfig The Config object to be registered as the |
|
186 | + * @param Config $bootstrapConfig The Config object to be registered as the |
|
187 | 187 | * 'BootstrapConfig' service. This has to contain at least the information |
188 | 188 | * needed to set up the 'ConfigFactory' service. If not provided, any call |
189 | 189 | * to getBootstrapConfig(), getConfigFactory, or getMainConfig will fail. |
@@ -34,7 +34,7 @@ discard block |
||
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; |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * Get ImageMagick subsampling factors for the target JPEG pixel format. |
109 | 109 | * |
110 | 110 | * @param string $pixelFormat one of 'yuv444', 'yuv422', 'yuv420' |
111 | - * @return array of string keys |
|
111 | + * @return string[] of string keys |
|
112 | 112 | */ |
113 | 113 | protected function imageMagickSubsampling( $pixelFormat ) { |
114 | 114 | switch ( $pixelFormat ) { |
@@ -563,7 +563,7 @@ |
||
563 | 563 | * @param array $params Rotate parameters. |
564 | 564 | * 'rotation' clockwise rotation in degrees, allowed are multiples of 90 |
565 | 565 | * @since 1.24 Is non-static. From 1.21 it was static |
566 | - * @return bool |
|
566 | + * @return MediaTransformError |
|
567 | 567 | */ |
568 | 568 | public function rotate( $file, $params ) { |
569 | 569 | return new MediaTransformError( 'thumbnail_error', 0, 0, |
@@ -53,6 +53,8 @@ |
||
53 | 53 | |
54 | 54 | /** |
55 | 55 | * Private constructor |
56 | + * @param string $text |
|
57 | + * @param boolean $lineStart |
|
56 | 58 | */ |
57 | 59 | private function __construct( $text, $lineStart ) { |
58 | 60 | $this->text = $text; |
@@ -371,8 +371,7 @@ discard block |
||
371 | 371 | * |
372 | 372 | * @since 1.17 |
373 | 373 | * |
374 | - * @param string|string[]|MessageSpecifier $key |
|
375 | - * @param mixed $param,... Parameters as strings. |
|
374 | + * @param string $key |
|
376 | 375 | * |
377 | 376 | * @return Message |
378 | 377 | */ |
@@ -415,8 +414,6 @@ discard block |
||
415 | 414 | * |
416 | 415 | * @since 1.18 |
417 | 416 | * |
418 | - * @param string|string[] $keys,... Message keys, or first argument as an array of all the |
|
419 | - * message keys. |
|
420 | 417 | * |
421 | 418 | * @return Message |
422 | 419 | */ |
@@ -487,8 +484,6 @@ discard block |
||
487 | 484 | * |
488 | 485 | * @since 1.17 |
489 | 486 | * |
490 | - * @param mixed $params,... Raw parameters as strings, or a single argument that is |
|
491 | - * an array of raw parameters. |
|
492 | 487 | * |
493 | 488 | * @return Message $this |
494 | 489 | */ |
@@ -509,8 +504,6 @@ discard block |
||
509 | 504 | * |
510 | 505 | * @since 1.18 |
511 | 506 | * |
512 | - * @param mixed $param,... Numeric parameters, or a single argument that is |
|
513 | - * an array of numeric parameters. |
|
514 | 507 | * |
515 | 508 | * @return Message $this |
516 | 509 | */ |
@@ -531,8 +524,6 @@ discard block |
||
531 | 524 | * |
532 | 525 | * @since 1.22 |
533 | 526 | * |
534 | - * @param int|int[] $param,... Duration parameters, or a single argument that is |
|
535 | - * an array of duration parameters. |
|
536 | 527 | * |
537 | 528 | * @return Message $this |
538 | 529 | */ |
@@ -553,8 +544,6 @@ discard block |
||
553 | 544 | * |
554 | 545 | * @since 1.22 |
555 | 546 | * |
556 | - * @param string|string[] $param,... Expiry parameters, or a single argument that is |
|
557 | - * an array of expiry parameters. |
|
558 | 547 | * |
559 | 548 | * @return Message $this |
560 | 549 | */ |
@@ -575,8 +564,6 @@ discard block |
||
575 | 564 | * |
576 | 565 | * @since 1.22 |
577 | 566 | * |
578 | - * @param int|int[] $param,... Time period parameters, or a single argument that is |
|
579 | - * an array of time period parameters. |
|
580 | 567 | * |
581 | 568 | * @return Message $this |
582 | 569 | */ |
@@ -597,8 +584,6 @@ discard block |
||
597 | 584 | * |
598 | 585 | * @since 1.22 |
599 | 586 | * |
600 | - * @param int|int[] $param,... Size parameters, or a single argument that is |
|
601 | - * an array of size parameters. |
|
602 | 587 | * |
603 | 588 | * @return Message $this |
604 | 589 | */ |
@@ -619,8 +604,6 @@ discard block |
||
619 | 604 | * |
620 | 605 | * @since 1.22 |
621 | 606 | * |
622 | - * @param int|int[] $param,... Bit rate parameters, or a single argument that is |
|
623 | - * an array of bit rate parameters. |
|
624 | 607 | * |
625 | 608 | * @return Message $this |
626 | 609 | */ |
@@ -643,8 +626,6 @@ discard block |
||
643 | 626 | * |
644 | 627 | * @since 1.25 |
645 | 628 | * |
646 | - * @param string|string[] $param,... plaintext parameters, or a single argument that is |
|
647 | - * an array of plaintext parameters. |
|
648 | 629 | * |
649 | 630 | * @return Message $this |
650 | 631 | */ |
@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | * Get all styles for a given context. |
382 | 382 | * |
383 | 383 | * @param ResourceLoaderContext $context |
384 | - * @return array CSS code for $context as an associative array mapping media type to CSS text. |
|
384 | + * @return string CSS code for $context as an associative array mapping media type to CSS text. |
|
385 | 385 | */ |
386 | 386 | public function getStyles( ResourceLoaderContext $context ) { |
387 | 387 | $styles = $this->readStyleFiles( |
@@ -631,7 +631,7 @@ discard block |
||
631 | 631 | * @param array $list List of file paths in any combination of index/path |
632 | 632 | * or path/options pairs |
633 | 633 | * @param string $option Option name |
634 | - * @param mixed $default Default value if the option isn't set |
|
634 | + * @param string $default Default value if the option isn't set |
|
635 | 635 | * @return array List of file paths, collated by $option |
636 | 636 | */ |
637 | 637 | protected static function collateFilePathListByOption( array $list, $option, $default ) { |
@@ -1007,6 +1007,7 @@ discard block |
||
1007 | 1007 | * the BOM character is not valid in the middle of a string. |
1008 | 1008 | * We already assume UTF-8 everywhere, so this should be safe. |
1009 | 1009 | * |
1010 | + * @param string $input |
|
1010 | 1011 | * @return string input minus the intial BOM char |
1011 | 1012 | */ |
1012 | 1013 | protected function stripBom( $input ) { |
@@ -371,6 +371,9 @@ |
||
371 | 371 | return 'djvuxml'; |
372 | 372 | } |
373 | 373 | |
374 | + /** |
|
375 | + * @param File $image |
|
376 | + */ |
|
374 | 377 | function isMetadataValid( $image, $metadata ) { |
375 | 378 | return !empty( $metadata ) && $metadata != serialize( [] ); |
376 | 379 | } |
@@ -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; |
@@ -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(); |
@@ -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,7 +80,7 @@ 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; |
@@ -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 = [] ) { |
220 | 220 | $this->streamFileWithStatus( $headers )->isOK(); |
@@ -445,6 +445,9 @@ discard block |
||
445 | 445 | /** @var string Plain text formatted version of the error */ |
446 | 446 | private $textMsg; |
447 | 447 | |
448 | + /** |
|
449 | + * @param string $msg |
|
450 | + */ |
|
448 | 451 | function __construct( $msg, $width, $height /*, ... */ ) { |
449 | 452 | $args = array_slice( func_get_args(), 3 ); |
450 | 453 | $htmlArgs = array_map( 'htmlspecialchars', $args ); |