* @ingroup Media
*/
use MediaWiki\MediaWikiServices;
+use MediaWiki\Shell\Shell;
/**
* Handler for images that need to be transformed
* 'physicalWidth' and 'physicalHeight' indicate the thumbnail dimensions.
* @return bool
*/
- function normaliseParams( $image, &$params ) {
+ public function normaliseParams( $image, &$params ) {
if ( !parent::normaliseParams( $image, $params ) ) {
return false;
}
'mimeType' => $image->getMimeType(),
'dstPath' => $dstPath,
'dstUrl' => $dstUrl,
- 'interlace' => isset( $params['interlace'] ) ? $params['interlace'] : false,
+ 'interlace' => $params['interlace'] ?? false,
];
if ( isset( $params['quality'] ) && $params['quality'] === 'low' ) {
}
# Try a hook. Called "Bitmap" for historical reasons.
- /** @var $mto MediaTransformOutput */
+ /** @var MediaTransformOutput $mto */
$mto = null;
Hooks::run( 'BitmapHandlerTransform', [ $this, $image, &$scalerParams, &$mto ] );
if ( !is_null( $mto ) ) {
}
// $scaler will return a MediaTransformError on failure, or false on success.
- // If the scaler is succesful, it will have created a thumbnail at the destination
+ // If the scaler is successful, it will have created a thumbnail at the destination
// path.
if ( is_array( $scaler ) && is_callable( $scaler ) ) {
// Allow subclasses to specify their own rendering methods.
$cache = MediaWikiServices::getInstance()->getLocalServerObjectCache();
$method = __METHOD__;
return $cache->getWithSetCallback(
- 'imagemagick-version',
+ $cache->makeGlobalKey( 'imagemagick-version' ),
$cache::TTL_HOUR,
function () use ( $method ) {
global $wgImageMagickConvertCommand;
- $cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
+ $cmd = Shell::escape( $wgImageMagickConvertCommand ) . ' -version';
wfDebug( $method . ": Running convert -version\n" );
$retval = '';
$return = wfShellExecWithStderr( $cmd, $retval );