*/
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;
/**
* @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
*/
* 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
+ * @deprecated since 1.34, use HTTPFileStreamer::send404Message() instead
*/
public static function send404Message( $fname, $flags = 0 ) {
+ wfDeprecated( __METHOD__, '1.34' );
HTTPFileStreamer::send404Message( $fname, $flags );
}
* 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
+ * @deprecated since 1.34, use HTTPFileStreamer::parseRange() instead
*/
public static function parseRange( $range, $size ) {
+ wfDeprecated( __METHOD__, '1.34' );
return HTTPFileStreamer::parseRange( $range, $size );
}
case 'png':
return 'image/png';
case 'jpg':
- return 'image/jpeg';
case 'jpeg':
return 'image/jpeg';
}
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.