From 7972c460ed5ee30e96946a85624e6cbae8209b4c Mon Sep 17 00:00:00 2001 From: Ricordisamoa Date: Wed, 24 Feb 2016 00:47:02 +0100 Subject: [PATCH] Add missing 'public' keywords to some MediaHandler methods * getParamMap * validateParam * makeParamString * parseParamString * canRender * mustRender * isMultiPage Change-Id: I0c00a61abf9be400dca5407370ca2c232d57ae17 --- includes/media/BMP.php | 2 +- includes/media/Bitmap.php | 6 +++--- includes/media/DjVu.php | 12 ++++++------ includes/media/ImageHandler.php | 10 +++++----- includes/media/Jpeg.php | 6 +++--- includes/media/MediaHandler.php | 14 +++++++------- includes/media/SVG.php | 10 +++++----- includes/media/Tiff.php | 4 ++-- includes/media/XCF.php | 2 +- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/includes/media/BMP.php b/includes/media/BMP.php index 64f12f71e4..4b9b268257 100644 --- a/includes/media/BMP.php +++ b/includes/media/BMP.php @@ -32,7 +32,7 @@ class BmpHandler extends BitmapHandler { * @param File $file * @return bool */ - function mustRender( $file ) { + public function mustRender( $file ) { return true; } diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php index b470e064c8..b055d16fc0 100644 --- a/includes/media/Bitmap.php +++ b/includes/media/Bitmap.php @@ -59,7 +59,7 @@ class BitmapHandler extends TransformationalImageHandler { return $scaler; } - function makeParamString( $params ) { + public function makeParamString( $params ) { $res = parent::makeParamString( $params ); if ( isset( $params['interlace'] ) && $params['interlace'] ) { return "interlaced-{$res}"; @@ -68,7 +68,7 @@ class BitmapHandler extends TransformationalImageHandler { } } - function parseParamString( $str ) { + public function parseParamString( $str ) { $remainder = preg_replace( '/^interlaced-/', '', $str ); $params = parent::parseParamString( $remainder ); if ( $params === false ) { @@ -78,7 +78,7 @@ class BitmapHandler extends TransformationalImageHandler { return $params; } - function validateParam( $name, $value ) { + public function validateParam( $name, $value ) { if ( $name === 'interlace' ) { return $value === false || $value === true; } else { diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php index 0d2ed29b00..d4ef8a875e 100644 --- a/includes/media/DjVu.php +++ b/includes/media/DjVu.php @@ -47,7 +47,7 @@ class DjVuHandler extends ImageHandler { * @param File $file * @return bool */ - function mustRender( $file ) { + public function mustRender( $file ) { return true; } @@ -64,14 +64,14 @@ class DjVuHandler extends ImageHandler { * @param File $file * @return bool */ - function isMultiPage( $file ) { + public function isMultiPage( $file ) { return true; } /** * @return array */ - function getParamMap() { + public function getParamMap() { return [ 'img_width' => 'width', 'img_page' => 'page', @@ -83,7 +83,7 @@ class DjVuHandler extends ImageHandler { * @param mixed $value * @return bool */ - function validateParam( $name, $value ) { + public function validateParam( $name, $value ) { if ( $name === 'page' && trim( $value ) !== (string)intval( $value ) ) { // Extra junk on the end of page, probably actually a caption // e.g. [[File:Foo.djvu|thumb|Page 3 of the document shows foo]] @@ -104,7 +104,7 @@ class DjVuHandler extends ImageHandler { * @param array $params * @return bool|string */ - function makeParamString( $params ) { + public function makeParamString( $params ) { $page = isset( $params['page'] ) ? $params['page'] : 1; if ( !isset( $params['width'] ) ) { return false; @@ -117,7 +117,7 @@ class DjVuHandler extends ImageHandler { * @param string $str * @return array|bool */ - function parseParamString( $str ) { + public function parseParamString( $str ) { $m = false; if ( preg_match( '/^page(\d+)-(\d+)px$/', $str, $m ) ) { return [ 'width' => $m[2], 'page' => $m[1] ]; diff --git a/includes/media/ImageHandler.php b/includes/media/ImageHandler.php index a7847bbeec..158c0dc6ea 100644 --- a/includes/media/ImageHandler.php +++ b/includes/media/ImageHandler.php @@ -31,15 +31,15 @@ abstract class ImageHandler extends MediaHandler { * @param File $file * @return bool */ - function canRender( $file ) { + public function canRender( $file ) { return ( $file->getWidth() && $file->getHeight() ); } - function getParamMap() { + public function getParamMap() { return [ 'img_width' => 'width' ]; } - function validateParam( $name, $value ) { + public function validateParam( $name, $value ) { if ( in_array( $name, [ 'width', 'height' ] ) ) { if ( $value <= 0 ) { return false; @@ -51,7 +51,7 @@ abstract class ImageHandler extends MediaHandler { } } - function makeParamString( $params ) { + public function makeParamString( $params ) { if ( isset( $params['physicalWidth'] ) ) { $width = $params['physicalWidth']; } elseif ( isset( $params['width'] ) ) { @@ -65,7 +65,7 @@ abstract class ImageHandler extends MediaHandler { return "{$width}px"; } - function parseParamString( $str ) { + public function parseParamString( $str ) { $m = false; if ( preg_match( '/^(\d+)px$/', $str, $m ) ) { return [ 'width' => $m[1] ]; diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php index 040ff96e1c..b8b6f6c987 100644 --- a/includes/media/Jpeg.php +++ b/includes/media/Jpeg.php @@ -42,7 +42,7 @@ class JpegHandler extends ExifBitmapHandler { return true; } - function validateParam( $name, $value ) { + public function validateParam( $name, $value ) { if ( $name === 'quality' ) { return self::validateQuality( $value ); } else { @@ -58,7 +58,7 @@ class JpegHandler extends ExifBitmapHandler { return $value === 'low'; } - function makeParamString( $params ) { + public function makeParamString( $params ) { // Prepend quality as "qValue-". This has to match parseParamString() below $res = parent::makeParamString( $params ); if ( $res && isset( $params['quality'] ) ) { @@ -67,7 +67,7 @@ class JpegHandler extends ExifBitmapHandler { return $res; } - function parseParamString( $str ) { + public function parseParamString( $str ) { // $str contains "qlow-200px" or "200px" strings because thumb.php would strip the filename // first - check if the string begins with "qlow-", and if so, treat it as quality. // Pass the first portion, or the whole string if "qlow-" not found, to the parent diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php index 95498ba5bd..6b0f887460 100644 --- a/includes/media/MediaHandler.php +++ b/includes/media/MediaHandler.php @@ -75,7 +75,7 @@ abstract class MediaHandler { * Get an associative array mapping magic word IDs to parameter names. * Will be used by the parser to identify parameters. */ - abstract function getParamMap(); + abstract public function getParamMap(); /** * Validate a thumbnail parameter at parse time. @@ -85,7 +85,7 @@ abstract class MediaHandler { * @param string $name * @param mixed $value */ - abstract function validateParam( $name, $value ); + abstract public function validateParam( $name, $value ); /** * Merge a parameter array into a string appropriate for inclusion in filenames @@ -93,7 +93,7 @@ abstract class MediaHandler { * @param array $params Array of parameters that have been through normaliseParams. * @return string */ - abstract function makeParamString( $params ); + abstract public function makeParamString( $params ); /** * Parse a param string made with makeParamString back into an array @@ -101,7 +101,7 @@ abstract class MediaHandler { * @param string $str The parameter string without file name (e.g. 122px) * @return array|bool Array of parameters or false on failure. */ - abstract function parseParamString( $str ); + abstract public function parseParamString( $str ); /** * Changes the parameter array as necessary, ready for transformation. @@ -342,7 +342,7 @@ abstract class MediaHandler { * @param File $file * @return bool */ - function canRender( $file ) { + public function canRender( $file ) { return true; } @@ -353,7 +353,7 @@ abstract class MediaHandler { * @param File $file * @return bool */ - function mustRender( $file ) { + public function mustRender( $file ) { return false; } @@ -363,7 +363,7 @@ abstract class MediaHandler { * @param File $file * @return bool */ - function isMultiPage( $file ) { + public function isMultiPage( $file ) { return false; } diff --git a/includes/media/SVG.php b/includes/media/SVG.php index d570f30ef2..7e77b25be3 100644 --- a/includes/media/SVG.php +++ b/includes/media/SVG.php @@ -51,7 +51,7 @@ class SvgHandler extends ImageHandler { } } - function mustRender( $file ) { + public function mustRender( $file ) { return true; } @@ -462,7 +462,7 @@ class SvgHandler extends ImageHandler { * @param mixed $value Parameter value * @return bool Validity */ - function validateParam( $name, $value ) { + public function validateParam( $name, $value ) { if ( in_array( $name, [ 'width', 'height' ] ) ) { // Reject negative heights, widths return ( $value > 0 ); @@ -485,7 +485,7 @@ class SvgHandler extends ImageHandler { * @param array $params Name=>value pairs of parameters * @return string Filename to use */ - function makeParamString( $params ) { + public function makeParamString( $params ) { $lang = ''; if ( isset( $params['lang'] ) && $params['lang'] !== 'en' ) { $params['lang'] = strtolower( $params['lang'] ); @@ -498,7 +498,7 @@ class SvgHandler extends ImageHandler { return "$lang{$params['width']}px"; } - function parseParamString( $str ) { + public function parseParamString( $str ) { $m = false; if ( preg_match( '/^lang([a-z]+(?:-[a-z]+)*)-(\d+)px$/', $str, $m ) ) { return [ 'width' => array_pop( $m ), 'lang' => $m[1] ]; @@ -509,7 +509,7 @@ class SvgHandler extends ImageHandler { } } - function getParamMap() { + public function getParamMap() { return [ 'img_lang' => 'lang', 'img_width' => 'width' ]; } diff --git a/includes/media/Tiff.php b/includes/media/Tiff.php index 750528f0f7..2e732493bf 100644 --- a/includes/media/Tiff.php +++ b/includes/media/Tiff.php @@ -40,7 +40,7 @@ class TiffHandler extends ExifBitmapHandler { * @param File $file * @return bool */ - function canRender( $file ) { + public function canRender( $file ) { global $wgTiffThumbnailType; return (bool)$wgTiffThumbnailType @@ -54,7 +54,7 @@ class TiffHandler extends ExifBitmapHandler { * @param File $file * @return bool */ - function mustRender( $file ) { + public function mustRender( $file ) { return true; } diff --git a/includes/media/XCF.php b/includes/media/XCF.php index 05c38472c6..f8fa2521d3 100644 --- a/includes/media/XCF.php +++ b/includes/media/XCF.php @@ -37,7 +37,7 @@ class XCFHandler extends BitmapHandler { * @param File $file * @return bool */ - function mustRender( $file ) { + public function mustRender( $file ) { return true; } -- 2.20.1