Merge "filebackend: Use HTTPFileStreamer::send404Message() in caller instead"

[lhc/web/wiklou.git] / includes / StreamFile.php

diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index cce3fc4..2afd651 100644 (file)
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -25,8 +25,10 @@
  */
 class StreamFile {
        // Do not send any HTTP headers unless requested by caller (e.g. body only)
+       /** @deprecated since 1.34 */
        const STREAM_HEADLESS = HTTPFileStreamer::STREAM_HEADLESS;
        // Do not try to tear down any PHP output buffers
+       /** @deprecated since 1.34 */
        const STREAM_ALLOW_OB = HTTPFileStreamer::STREAM_ALLOW_OB;
 
        /**
@@ -38,7 +40,7 @@ class StreamFile {
         * @param array $headers Any additional headers to send if the file exists
         * @param bool $sendErrors Send error messages if errors occur (like 404)
         * @param array $optHeaders HTTP request header map (e.g. "range") (use lowercase keys)
-        * @param integer $flags Bitfield of STREAM_* constants
+        * @param int $flags Bitfield of STREAM_* constants
         * @throws MWException
         * @return bool Success
         */
@@ -64,7 +66,7 @@ class StreamFile {
         * Send out a standard 404 message for a file
         *
         * @param string $fname Full name and path of the file to stream
-        * @param integer $flags Bitfield of STREAM_* constants
+        * @param int $flags Bitfield of STREAM_* constants
         * @since 1.24
         */
        public static function send404Message( $fname, $flags = 0 ) {
@@ -75,7 +77,7 @@ class StreamFile {
         * Convert a Range header value to an absolute (start, end) range tuple
         *
         * @param string $range Range header value
-        * @param integer $size File size
+        * @param int $size File size
         * @return array|string Returns error string on failure (start, end, length)
         * @since 1.24
         */
@@ -105,7 +107,6 @@ class StreamFile {
                                case 'png':
                                        return 'image/png';
                                case 'jpg':
-                                       return 'image/jpeg';
                                case 'jpeg':
                                        return 'image/jpeg';
                        }
@@ -113,7 +114,7 @@ class StreamFile {
                        return 'unknown/unknown';
                }
 
-               $magic = MimeMagic::singleton();
+               $magic = MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer();
                // Use the extension only, rather than magic numbers, to avoid opening
                // up vulnerabilities due to uploads of files with allowed extensions
                // but disallowed types.