Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resourceloader: Clarify operator precedence

Browse source 
Change-Id: I478db046a1cc162c6767003ce45c9b56270f3372
This commit is contained in:
Bartosz Dziewoński 2017-10-07 00:38:36 +02:00 committed by Krinkle
parent c16f2ef085
commit ad7e98afbb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/resourceloader/ResourceLoaderImageModule.php
View file

@ -249,7 +249,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
$fileDescriptor = is_string( $options ) ? $options : $options['file'];
$allowedVariants = array_merge(
is_array( $options ) && isset( $options['variants'] ) ? $options['variants'] : [],
( is_array( $options ) && isset( $options['variants'] ) ) ? $options['variants'] : [],
$this->getGlobalVariants( $context )
);
if ( isset( $this->variants[$skin] ) ) {

4
tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
View file

@ -15,8 +15,8 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
protected function getTestImage( $name ) {
$options = ResourceLoaderImageModuleTest::$commonImageData[$name];
$fileDescriptor = is_string( $options ) ? $options : $options['file'];
$allowedVariants = is_array( $options ) &&
isset( $options['variants'] ) ? $options['variants'] : [];
$allowedVariants = ( is_array( $options ) && isset( $options['variants'] ) ) ?
$options['variants'] : [];
$variants = array_fill_keys( $allowedVariants, [ 'color' => 'red' ] );
return new ResourceLoaderImageTestable(
$name,