X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FWebP.php;h=35e885f1ca108331c5313ad88526369f262184da;hb=c846d75b27a5d286cccebe25b259a72e0b22feb5;hp=f894618a761d74927b74d910972766bc86e0455c;hpb=c97d773e1427a8827e3e6889547cd054c51c86e7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/WebP.php b/includes/media/WebP.php
index f894618a76..35e885f1ca 100644
--- a/includes/media/WebP.php
+++ b/includes/media/WebP.php
@@ -63,9 +63,9 @@ class WebPHandler extends BitmapHandler {
 				return self::METADATA_GOOD;
 		}
 
-		wfSuppressWarnings();
+		MediaWiki\suppressWarnings();
 		$data = unserialize( $metadata );
-		wfRestoreWarnings();
+		MediaWiki\restoreWarnings();
 
 		if ( !$data || !is_array( $data ) ) {
 				wfDebug( __METHOD__ . " invalid WebP metadata\n" );
@@ -122,10 +122,10 @@ class WebPHandler extends BitmapHandler {
 	 * 'compression' can be 'lossy', 'lossless', 'animated' or 'unknown'
 	 */
 	public static function extractMetadataFromChunks( $chunks, $filename ) {
-		$vp8Info = array();
+		$vp8Info = [];
 
 		foreach ( $chunks as $chunk ) {
-			if ( !in_array( $chunk['fourCC'], array( 'VP8 ', 'VP8L', 'VP8X' ) ) ) {
+			if ( !in_array( $chunk['fourCC'], [ 'VP8 ', 'VP8L', 'VP8X' ] ) ) {
 				// Not a chunk containing interesting metadata
 				continue;
 			}
@@ -154,7 +154,7 @@ class WebPHandler extends BitmapHandler {
 	/**
 	 * Decodes a lossy chunk header
 	 * @param string $header Header string
-	 * @return boolean|array See WebPHandler::decodeHeader
+	 * @return bool|array See WebPHandler::decodeHeader
 	 */
 	protected static function decodeLossyChunkHeader( $header ) {
 		// Bytes 0-3 are 'VP8 '
@@ -165,22 +165,22 @@ class WebPHandler extends BitmapHandler {
 		if ( $syncCode != "\x9D\x01\x2A" ) {
 			wfDebugLog( 'WebP', __METHOD__ . ': Invalid sync code: ' .
 				bin2hex( $syncCode ) . "\n" );
-			return array();
+			return [];
 		}
 		// Bytes 14-17 are image size
 		$imageSize = unpack( 'v2', substr( $header, 14, 4 ) );
 		// Image sizes are 14 bit, 2 MSB are scaling parameters which are ignored here
-		return array(
+		return [
 			'compression' => 'lossy',
 			'width' => $imageSize[1] & 0x3FFF,
 			'height' => $imageSize[2] & 0x3FFF
-		);
+		];
 	}
 
 	/**
 	 * Decodes a lossless chunk header
 	 * @param string $header Header string
-	 * @return boolean|array See WebPHandler::decodeHeader
+	 * @return bool|array See WebPHandler::decodeHeader
 	 */
 	public static function decodeLosslessChunkHeader( $header ) {
 		// Bytes 0-3 are 'VP8L'
@@ -189,23 +189,23 @@ class WebPHandler extends BitmapHandler {
 		if ( $header{8} != "\x2F" ) {
 			wfDebugLog( 'WebP', __METHOD__ . ': Invalid signature: ' .
 				bin2hex( $header{8} ) . "\n" );
-			return array();
+			return [];
 		}
 		// Bytes 9-12 contain the image size
 		// Bits 0-13 are width-1; bits 15-27 are height-1
 		$imageSize = unpack( 'C4', substr( $header, 9, 4 ) );
-		return array(
+		return [
 				'compression' => 'lossless',
 				'width' => ( $imageSize[1] | ( ( $imageSize[2] & 0x3F ) << 8 ) ) + 1,
 				'height' => ( ( ( $imageSize[2] & 0xC0 ) >> 6 ) |
 						( $imageSize[3] << 2 ) | ( ( $imageSize[4] & 0x03 ) << 10 ) ) + 1
-		);
+		];
 	}
 
 	/**
 	 * Decodes an extended chunk header
 	 * @param string $header Header string
-	 * @return boolean|array See WebPHandler::decodeHeader
+	 * @return bool|array See WebPHandler::decodeHeader
 	 */
 	public static function decodeExtendedChunkHeader( $header ) {
 		// Bytes 0-3 are 'VP8X'
@@ -217,13 +217,13 @@ class WebPHandler extends BitmapHandler {
 		$width = unpack( 'V', substr( $header, 12, 3 ) . "\x00" );
 		$height = unpack( 'V', substr( $header, 15, 3 ) . "\x00" );
 
-		return array(
+		return [
 			'compression' => 'unknown',
 			'animated' => ( $flags[1] & self::VP8X_ANIM ) == self::VP8X_ANIM,
 			'transparency' => ( $flags[1] & self::VP8X_ALPHA ) == self::VP8X_ALPHA,
 			'width' => ( $width[1] & 0xFFFFFF ) + 1,
 			'height' => ( $height[1] & 0xFFFFFF ) + 1
-		);
+		];
 	}
 
 	public function getImageSize( $file, $path, $metadata = false ) {
@@ -234,14 +234,14 @@ class WebPHandler extends BitmapHandler {
 			$metadata = $file->getMetadata();
 		}
 
-		wfSuppressWarnings();
+		MediaWiki\suppressWarnings();
 		$metadata = unserialize( $metadata );
-		wfRestoreWarnings();
+		MediaWiki\restoreWarnings();
 
 		if ( $metadata == false ) {
 			return false;
 		}
-		return array( $metadata['width'], $metadata['height'] );
+		return [ $metadata['width'], $metadata['height'] ];
 	}
 
 	/**
@@ -292,7 +292,7 @@ class WebPHandler extends BitmapHandler {
 	 * @return array
 	 */
 	public function getThumbType( $ext, $mime, $params = null ) {
-		return array( 'png', 'image/png' );
+		return [ 'png', 'image/png' ];
 	}
 
 	/**