Merge "Linker: Document parseComment() as returning HTML"

[lhc/web/wiklou.git] / includes / media / MediaHandler.php

diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php
index 5dca24b..71db975 100644 (file)
--- a/includes/media/MediaHandler.php
+++ b/includes/media/MediaHandler.php
@@ -158,9 +158,9 @@ abstract class MediaHandler {
        function convertMetadataVersion( $metadata, $version = 1 ) {
                if ( !is_array( $metadata ) ) {
                        // unserialize to keep return parameter consistent.
-                       MediaWiki\suppressWarnings();
+                       Wikimedia\suppressWarnings();
                        $ret = unserialize( $metadata );
-                       MediaWiki\restoreWarnings();
+                       Wikimedia\restoreWarnings();
 
                        return $ret;
                }
@@ -284,7 +284,7 @@ abstract class MediaHandler {
         *
         * @param string $ext Extension of original file
         * @param string $mime MIME type of original file
-        * @param array $params Handler specific rendering parameters
+        * @param array|null $params Handler specific rendering parameters
         * @return array Thumbnail extension and MIME type
         */
        function getThumbType( $ext, $mime, $params = null ) {
@@ -303,16 +303,6 @@ abstract class MediaHandler {
                return [ $ext, $mime ];
        }
 
-       /**
-        * @deprecated since 1.30, use MediaHandler::getContentHeaders instead
-        * @param array $metadata
-        * @return array
-        */
-       public function getStreamHeaders( $metadata ) {
-               wfDeprecated( __METHOD__, '1.30' );
-               return $this->getContentHeaders( $metadata );
-       }
-
        /**
         * True if the handled types can be transformed
         *
@@ -780,6 +770,19 @@ abstract class MediaHandler {
                return [];
        }
 
+       /**
+        * When overridden in a descendant class, returns a language code most suiting
+        *
+        * @since 1.32
+        *
+        * @param string $userPreferredLanguage Language code requesed
+        * @param string[] $availableLanguages Languages present in the file
+        * @return string|null Language code picked or null if not supported/available
+        */
+       public function getMatchedLanguage( $userPreferredLanguage, array $availableLanguages ) {
+               return null;
+       }
+
        /**
         * On file types that support renderings in multiple languages,
         * which language is used by default if unspecified.