jenkins-bot has submitted this change and it was merged.
Change subject: ResourceLoaderImageModule: Rename 'image' in descriptors to
'file'
......................................................................
ResourceLoaderImageModule: Rename 'image' in descriptors to 'file'
Like in OOjs UI. Less confusing. No one is using this yet.
Bug: T93669
Change-Id: Ib1c9af96b46ba660b3697d272129e071da1fdf18
---
M includes/resourceloader/ResourceLoaderImage.php
M includes/resourceloader/ResourceLoaderImageModule.php
M tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
3 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoaderImage.php
b/includes/resourceloader/ResourceLoaderImage.php
index 4a1f409..4b16a12 100644
--- a/includes/resourceloader/ResourceLoaderImage.php
+++ b/includes/resourceloader/ResourceLoaderImage.php
@@ -61,11 +61,11 @@
} );
$extensions = array_unique( $extensions );
if ( count( $extensions ) !== 1 ) {
- throw new MWException( 'Image type for various images
differs.' );
+ throw new MWException( "File type for different image
files of '$name' not the same." );
}
$ext = $extensions[0];
if ( !isset( self::$fileTypes[$ext] ) ) {
- throw new MWException( 'Invalid image type; svg, png,
gif or jpg required.' );
+ throw new MWException( "Invalid file type for image
files of '$name' (valid: svg, png, gif, jpg)." );
}
$this->extension = $ext;
}
diff --git a/includes/resourceloader/ResourceLoaderImageModule.php
b/includes/resourceloader/ResourceLoaderImageModule.php
index 57731fa..28aebdf 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -177,7 +177,7 @@
$this->imageObjects = array();
foreach ( $this->images as $name => $options ) {
- $imageDesc = is_string( $options ) ? $options :
$options['image'];
+ $fileDescriptor = is_string( $options ) ?
$options : $options['file'];
$allowedVariants = array_merge(
is_array( $options ) && isset(
$options['variants'] ) ? $options['variants'] : array(),
@@ -195,7 +195,7 @@
$image = new ResourceLoaderImage(
$name,
$this->getName(),
- $imageDesc,
+ $fileDescriptor,
$this->localBasePath,
$variantConfig
);
diff --git
a/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
b/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
index 5aa1237..a316a17 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
@@ -25,17 +25,17 @@
$commonImageData = array(
'advanced' => 'advanced.svg',
'remove' => array(
- 'image' => 'remove.svg',
+ 'file' => 'remove.svg',
'variants' => array( 'destructive' ),
),
'next' => array(
- 'image' => array(
+ 'file' => array(
'ltr' => 'next.svg',
'rtl' => 'prev.svg'
),
),
'help' => array(
- 'image' => array(
+ 'file' => array(
'ltr' => 'help-ltr.svg',
'rtl' => 'help-rtl.svg',
'lang' => array(
@@ -44,7 +44,7 @@
),
),
'bold' => array(
- 'image' => array(
+ 'file' => array(
'default' => 'bold-a.svg',
'lang' => array(
'en' => 'bold-b.svg',
--
To view, visit https://gerrit.wikimedia.org/r/200275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1c9af96b46ba660b3697d272129e071da1fdf18
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
