X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FMediaTransformOutput.php;h=010cf801776b71c4d075e4f4663075ddb28b43e4;hb=3c25a52df91930c56f4f9da9b216ebed993022c1;hp=3506684a50e306b8ecde4b359f9d2eba82e8c03d;hpb=6322d7ec9df81727b9c37c0d574ea2505d641edb;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/media/MediaTransformOutput.php b/includes/media/MediaTransformOutput.php index 3506684a50..010cf80177 100644 --- a/includes/media/MediaTransformOutput.php +++ b/includes/media/MediaTransformOutput.php @@ -236,7 +236,7 @@ abstract class MediaTransformOutput { } /** - * @param string $title + * @param string|null $title * @param string|array $params Query parameters to add * @return array */ @@ -360,9 +360,9 @@ class ThumbnailImage extends MediaTransformOutput { throw new MWException( __METHOD__ . ' called in the old style' ); } - $alt = isset( $options['alt'] ) ? $options['alt'] : ''; + $alt = $options['alt'] ?? ''; - $query = isset( $options['desc-query'] ) ? $options['desc-query'] : ''; + $query = $options['desc-query'] ?? ''; $attribs = [ 'alt' => $alt, @@ -487,8 +487,8 @@ class MediaTransformError extends MediaTransformOutput { class TransformParameterError extends MediaTransformError { function __construct( $params ) { parent::__construct( 'thumbnail_error', - max( isset( $params['width'] ) ? $params['width'] : 0, 120 ), - max( isset( $params['height'] ) ? $params['height'] : 0, 120 ), + max( $params['width'] ?? 0, 120 ), + max( $params['height'] ?? 0, 120 ), wfMessage( 'thumbnail_invalid_params' ) ); } @@ -507,13 +507,13 @@ class TransformParameterError extends MediaTransformError { class TransformTooBigImageAreaError extends MediaTransformError { function __construct( $params, $maxImageArea ) { $msg = wfMessage( 'thumbnail_toobigimagearea' ); - $msg->rawParams( + $msg->params( $msg->getLanguage()->formatComputingNumbers( $maxImageArea, 1000, "size-$1pixel" ) ); parent::__construct( 'thumbnail_error', - max( isset( $params['width'] ) ? $params['width'] : 0, 120 ), - max( isset( $params['height'] ) ? $params['height'] : 0, 120 ), + max( $params['width'] ?? 0, 120 ), + max( $params['height'] ?? 0, 120 ), $msg ); }