X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FTransformationalImageHandler.php;h=85430d2c23de323852aa3fef3740d440755ddc25;hb=ea84d81e6a65968da7c56dc8623b22803418bf92;hp=60aec45729852c5218fa449b5bc106a2013de73e;hpb=f9e21f91e459c40fed6d8f2e76cccbce07e2ba1b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 60aec45729..85430d2c23 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -36,7 +36,7 @@ use MediaWiki\MediaWikiServices;
 abstract class TransformationalImageHandler extends ImageHandler {
 	/**
 	 * @param File $image
-	 * @param array $params Transform parameters. Entries with the keys 'width'
+	 * @param array &$params Transform parameters. Entries with the keys 'width'
 	 * and 'height' are the respective screen width and height, while the keys
 	 * 'physicalWidth' and 'physicalHeight' indicate the thumbnail dimensions.
 	 * @return bool
@@ -156,7 +156,6 @@ abstract class TransformationalImageHandler extends ImageHandler {
 			&& $scalerParams['physicalHeight'] == $scalerParams['srcHeight']
 			&& !isset( $scalerParams['quality'] )
 		) {
-
 			# normaliseParams (or the user) wants us to return the unscaled image
 			wfDebug( __METHOD__ . ": returning unscaled image\n" );
 
@@ -222,7 +221,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 		}
 
 		# 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 ) ) {
@@ -513,7 +512,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 		$cache = MediaWikiServices::getInstance()->getLocalServerObjectCache();
 		$method = __METHOD__;
 		return $cache->getWithSetCallback(
-			'imagemagick-version',
+			$cache->makeGlobalKey( 'imagemagick-version' ),
 			$cache::TTL_HOUR,
 			function () use ( $method ) {
 				global $wgImageMagickConvertCommand;
@@ -521,7 +520,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 				$cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
 				wfDebug( $method . ": Running convert -version\n" );
 				$retval = '';
-				$return = wfShellExec( $cmd, $retval );
+				$return = wfShellExecWithStderr( $cmd, $retval );
 				$x = preg_match(
 					'/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches
 				);
@@ -569,7 +568,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 	 */
 	public function rotate( $file, $params ) {
 		return new MediaTransformError( 'thumbnail_error', 0, 0,
-			get_class( $this ) . ' rotation not implemented' );
+			static::class . ' rotation not implemented' );
 	}
 
 	/**
@@ -589,7 +588,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 	 * Runs the 'BitmapHandlerCheckImageArea' hook.
 	 *
 	 * @param File $file
-	 * @param array $params
+	 * @param array &$params
 	 * @return bool
 	 * @since 1.25
 	 */