dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update suppressWarning()/restoreWarning() calls
[lhc/web/wiklou.git]
/
includes
/
media
/
ImageHandler.php
diff --git
a/includes/media/ImageHandler.php
b/includes/media/ImageHandler.php
index
c2870c2
..
a0a1603
100644
(file)
--- a/
includes/media/ImageHandler.php
+++ b/
includes/media/ImageHandler.php
@@
-31,16
+31,16
@@
abstract class ImageHandler extends MediaHandler {
* @param File $file
* @return bool
*/
* @param File $file
* @return bool
*/
- function canRender( $file ) {
+
public
function canRender( $file ) {
return ( $file->getWidth() && $file->getHeight() );
}
return ( $file->getWidth() && $file->getHeight() );
}
- function getParamMap() {
- return
array( 'img_width' => 'width' )
;
+
public
function getParamMap() {
+ return
[ 'img_width' => 'width' ]
;
}
}
- function validateParam( $name, $value ) {
- if ( in_array( $name,
array( 'width', 'height' )
) ) {
+
public
function validateParam( $name, $value ) {
+ if ( in_array( $name,
[ 'width', 'height' ]
) ) {
if ( $value <= 0 ) {
return false;
} else {
if ( $value <= 0 ) {
return false;
} else {
@@
-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'] ) ) {
if ( isset( $params['physicalWidth'] ) ) {
$width = $params['physicalWidth'];
} elseif ( isset( $params['width'] ) ) {
@@
-65,22
+65,22
@@
abstract class ImageHandler extends MediaHandler {
return "{$width}px";
}
return "{$width}px";
}
- function parseParamString( $str ) {
+
public
function parseParamString( $str ) {
$m = false;
if ( preg_match( '/^(\d+)px$/', $str, $m ) ) {
$m = false;
if ( preg_match( '/^(\d+)px$/', $str, $m ) ) {
- return
array( 'width' => $m[1] )
;
+ return
[ 'width' => $m[1] ]
;
} else {
return false;
}
}
function getScriptParams( $params ) {
} else {
return false;
}
}
function getScriptParams( $params ) {
- return
array( 'width' => $params['width'] )
;
+ return
[ 'width' => $params['width'] ]
;
}
/**
* @param File $image
}
/**
* @param File $image
- * @param array $params
+ * @param array
&
$params
* @return bool
*/
function normaliseParams( $image, &$params ) {
* @return bool
*/
function normaliseParams( $image, &$params ) {
@@
-152,8
+152,8
@@
abstract class ImageHandler extends MediaHandler {
/**
* Validate thumbnail parameters and fill in the correct height
*
/**
* Validate thumbnail parameters and fill in the correct height
*
- * @param int $width Specified width (input/output)
- * @param int $height Height (output only)
+ * @param int
&
$width Specified width (input/output)
+ * @param int
&
$height Height (output only)
* @param int $srcWidth Width of the source image
* @param int $srcHeight Height of the source image
* @param string $mimeType Unused
* @param int $srcWidth Width of the source image
* @param int $srcHeight Height of the source image
* @param string $mimeType Unused
@@
-201,9
+201,9
@@
abstract class ImageHandler extends MediaHandler {
}
function getImageSize( $image, $path ) {
}
function getImageSize( $image, $path ) {
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$gis = getimagesize( $path );
$gis = getimagesize( $path );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
return $gis;
}
return $gis;
}