From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 25 Feb 2019 16:40:50 +0000 (+0000)
Subject: Merge "media: Mark ImageHandler::getScriptParams() as protected"
X-Git-Tag: 1.34.0-rc.0~2726
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/modifier.php?a=commitdiff_plain;h=80a999362cc909232a9015ed03bef5288d289a15;hp=46ae5683a04ad6d73a504b50b7bb7253df9f5c77;p=lhc%2Fweb%2Fwiklou.git

Merge "media: Mark ImageHandler::getScriptParams() as protected"
---

diff --git a/includes/media/DjVuHandler.php b/includes/media/DjVuHandler.php
index 44135251c7..ed62ba1f46 100644
--- a/includes/media/DjVuHandler.php
+++ b/includes/media/DjVuHandler.php
@@ -130,7 +130,7 @@ class DjVuHandler extends ImageHandler {
 	 * @param array $params
 	 * @return array
 	 */
-	function getScriptParams( $params ) {
+	protected function getScriptParams( $params ) {
 		return [
 			'width' => $params['width'],
 			'page' => $params['page'],
diff --git a/includes/media/ImageHandler.php b/includes/media/ImageHandler.php
index b7042dc76b..302e743a1a 100644
--- a/includes/media/ImageHandler.php
+++ b/includes/media/ImageHandler.php
@@ -74,7 +74,7 @@ abstract class ImageHandler extends MediaHandler {
 		}
 	}
 
-	function getScriptParams( $params ) {
+	protected function getScriptParams( $params ) {
 		return [ 'width' => $params['width'] ];
 	}
 
diff --git a/includes/media/JpegHandler.php b/includes/media/JpegHandler.php
index eaf842eb04..4bcb53dd56 100644
--- a/includes/media/JpegHandler.php
+++ b/includes/media/JpegHandler.php
@@ -90,7 +90,7 @@ class JpegHandler extends ExifBitmapHandler {
 		return $res;
 	}
 
-	function getScriptParams( $params ) {
+	protected function getScriptParams( $params ) {
 		$res = parent::getScriptParams( $params );
 		if ( isset( $params['quality'] ) ) {
 			$res['quality'] = $params['quality'];
diff --git a/includes/media/SvgHandler.php b/includes/media/SvgHandler.php
index 436483b23c..b7745df9bc 100644
--- a/includes/media/SvgHandler.php
+++ b/includes/media/SvgHandler.php
@@ -594,7 +594,7 @@ class SvgHandler extends ImageHandler {
 	 * @param array $params
 	 * @return array
 	 */
-	function getScriptParams( $params ) {
+	protected function getScriptParams( $params ) {
 		$scriptParams = [ 'width' => $params['width'] ];
 		if ( isset( $params['lang'] ) ) {
 			$scriptParams['lang'] = $params['lang'];