From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Fri, 6 Oct 2017 22:38:36 +0000 (+0200)
Subject: resourceloader: Clarify operator precedence
X-Git-Tag: 1.31.0-rc.0~1852^2
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=ad7e98afbbc2e6473c83dbceb866ab89e31ab459;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Clarify operator precedence

Change-Id: I478db046a1cc162c6767003ce45c9b56270f3372
---

diff --git a/includes/resourceloader/ResourceLoaderImageModule.php b/includes/resourceloader/ResourceLoaderImageModule.php
index 8b5495958c..71a0fa2bae 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -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] ) ) {
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
index aea2776463..838d2c087f 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
@@ -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,