X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FTransformationalImageHandler.php;h=1ab0f369dbd8e45d34712b68f4c4a7e7ea3d57c2;hb=2480aae0c97d822e10b50619e7b48b25c45af073;hp=11c4d4214c05d1a89086ad190c75e7b88870d555;hpb=adae996840b9e782f6e14b21c433a83e37c3a74e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 11c4d4214c..de438da2cf 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" );
 
@@ -217,12 +216,12 @@ abstract class TransformationalImageHandler extends ImageHandler {
 
 			return new MediaTransformError( 'thumbnail_error',
 				$scalerParams['clientWidth'], $scalerParams['clientHeight'],
-				wfMessage( 'filemissing' )->text()
+				wfMessage( 'filemissing' )
 			);
 		}
 
 		# 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 ) ) {
@@ -267,7 +266,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 			# Thumbnail was zero-byte and had to be removed
 			return new MediaTransformError( 'thumbnail_error',
 				$scalerParams['clientWidth'], $scalerParams['clientHeight'],
-				wfMessage( 'unknown-error' )->text()
+				wfMessage( 'unknown-error' )
 			);
 		} elseif ( $mto ) {
 			return $mto;
@@ -511,21 +510,22 @@ abstract class TransformationalImageHandler extends ImageHandler {
 	 */
 	protected function getMagickVersion() {
 		$cache = MediaWikiServices::getInstance()->getLocalServerObjectCache();
+		$method = __METHOD__;
 		return $cache->getWithSetCallback(
 			'imagemagick-version',
 			$cache::TTL_HOUR,
-			function () {
+			function () use ( $method ) {
 				global $wgImageMagickConvertCommand;
 
 				$cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
-				wfDebug( __METHOD__ . ": Running convert -version\n" );
+				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
 				);
 				if ( $x != 1 ) {
-					wfDebug( __METHOD__ . ": ImageMagick version check failed\n" );
+					wfDebug( $method . ": ImageMagick version check failed\n" );
 					return false;
 				}
 
@@ -564,11 +564,11 @@ abstract class TransformationalImageHandler extends ImageHandler {
 	 * @param array $params Rotate parameters.
 	 *   'rotation' clockwise rotation in degrees, allowed are multiples of 90
 	 * @since 1.24 Is non-static. From 1.21 it was static
-	 * @return bool
+	 * @return bool|MediaTransformError
 	 */
 	public function rotate( $file, $params ) {
 		return new MediaTransformError( 'thumbnail_error', 0, 0,
-			get_class( $this ) . ' rotation not implemented' );
+			static::class . ' rotation not implemented' );
 	}
 
 	/**
@@ -588,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
 	 */