From 57bfd3d67821194e9ee3e5308f64290aa11143cd Mon Sep 17 00:00:00 2001 From: Jack Phoenix Date: Sat, 6 Apr 2019 15:48:39 +0300 Subject: [PATCH] resourceloader: Fix variable spacings where need be This fix is to make sure resource loader code conforms with convension https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP#Spaces. Change-Id: I34c0a0addbf7c373fc3a64b644a3098bb485a3f4 --- .../ResourceLoaderFileModule.php | 2 +- .../resourceloader/ResourceLoaderImage.php | 2 +- .../ResourceLoaderOOUIFileModule.php | 8 +++---- .../ResourceLoaderOOUIModule.php | 2 +- .../ResourceLoaderSkinModule.php | 22 ++++++++++++------- .../ResourceLoaderWikiModule.php | 2 +- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php index 9be5de3d6d..031541b559 100644 --- a/includes/resourceloader/ResourceLoaderFileModule.php +++ b/includes/resourceloader/ResourceLoaderFileModule.php @@ -385,7 +385,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { if ( $this->packageFiles !== null ) { $packageFiles = $this->getPackageFiles( $context ); if ( $deprecationScript ) { - $mainFile =& $packageFiles['files'][ $packageFiles['main'] ]; + $mainFile =& $packageFiles['files'][$packageFiles['main']]; $mainFile['content'] = $deprecationScript . $mainFile['content']; } return $packageFiles; diff --git a/includes/resourceloader/ResourceLoaderImage.php b/includes/resourceloader/ResourceLoaderImage.php index 8cd5b19fd4..d10be12fe3 100644 --- a/includes/resourceloader/ResourceLoaderImage.php +++ b/includes/resourceloader/ResourceLoaderImage.php @@ -73,7 +73,7 @@ class ResourceLoaderImage { } // Remove 'deprecated' key if ( is_array( $this->descriptor ) ) { - unset( $this->descriptor[ 'deprecated' ] ); + unset( $this->descriptor['deprecated'] ); } // Ensure that all files have common extension. diff --git a/includes/resourceloader/ResourceLoaderOOUIFileModule.php b/includes/resourceloader/ResourceLoaderOOUIFileModule.php index e97e074201..7d39a58e9c 100644 --- a/includes/resourceloader/ResourceLoaderOOUIFileModule.php +++ b/includes/resourceloader/ResourceLoaderOOUIFileModule.php @@ -28,15 +28,15 @@ class ResourceLoaderOOUIFileModule extends ResourceLoaderFileModule { use ResourceLoaderOOUIModule; public function __construct( $options = [] ) { - if ( isset( $options[ 'themeScripts' ] ) ) { - $skinScripts = $this->getSkinSpecific( $options[ 'themeScripts' ], 'scripts' ); + if ( isset( $options['themeScripts'] ) ) { + $skinScripts = $this->getSkinSpecific( $options['themeScripts'], 'scripts' ); if ( !isset( $options['skinScripts'] ) ) { $options['skinScripts'] = []; } $this->extendSkinSpecific( $options['skinScripts'], $skinScripts ); } - if ( isset( $options[ 'themeStyles' ] ) ) { - $skinStyles = $this->getSkinSpecific( $options[ 'themeStyles' ], 'styles' ); + if ( isset( $options['themeStyles'] ) ) { + $skinStyles = $this->getSkinSpecific( $options['themeStyles'], 'styles' ); if ( !isset( $options['skinStyles'] ) ) { $options['skinStyles'] = []; } diff --git a/includes/resourceloader/ResourceLoaderOOUIModule.php b/includes/resourceloader/ResourceLoaderOOUIModule.php index 0a4e94e40b..0395127c57 100644 --- a/includes/resourceloader/ResourceLoaderOOUIModule.php +++ b/includes/resourceloader/ResourceLoaderOOUIModule.php @@ -104,7 +104,7 @@ trait ResourceLoaderOOUIModule { */ protected function getThemePath( $theme, $kind, $module ) { $paths = self::getThemePaths(); - $path = $paths[ $theme ][ $kind ]; + $path = $paths[$theme][$kind]; $path = str_replace( '{module}', $module, $path ); return $path; } diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php b/includes/resourceloader/ResourceLoaderSkinModule.php index 6393803df9..2dd6c17ddd 100644 --- a/includes/resourceloader/ResourceLoaderSkinModule.php +++ b/includes/resourceloader/ResourceLoaderSkinModule.php @@ -98,14 +98,14 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule { if ( !is_array( $logo ) ) { // No media queries required if we only have one variant - $preloadLinks[ $logo ] = [ 'as' => 'image' ]; + $preloadLinks[$logo] = [ 'as' => 'image' ]; return $preloadLinks; } if ( isset( $logo['svg'] ) ) { // No media queries required if we only have a 1x and svg variant // because all preload-capable browsers support SVGs - $preloadLinks [ $logo['svg'] ] = [ 'as' => 'image' ]; + $preloadLinks[$logo['svg']] = [ 'as' => 'image' ]; return $preloadLinks; } @@ -124,7 +124,10 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule { } ); foreach ( $logosPerDppx as $dppx => $src ) { - $logos[] = [ 'dppx' => $dppx, 'src' => $src ]; + $logos[] = [ + 'dppx' => $dppx, + 'src' => $src + ]; } $logosCount = count( $logos ); @@ -138,21 +141,24 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule { // Smallest dppx // min-resolution is ">=" (larger than or equal to) // "not min-resolution" is essentially "<" - $media_query = 'not all and (min-resolution: ' . $logos[ 1 ]['dppx'] . 'dppx)'; + $media_query = 'not all and (min-resolution: ' . $logos[1]['dppx'] . 'dppx)'; } elseif ( $i !== $logosCount - 1 ) { // In between // Media query expressions can only apply "not" to the entire expression // (e.g. can't express ">= 1.5 and not >= 2). // Workaround: Use <= 1.9999 in place of < 2. - $upper_bound = floatval( $logos[ $i + 1 ]['dppx'] ) - 0.000001; - $media_query = '(min-resolution: ' . $logos[ $i ]['dppx'] . + $upper_bound = floatval( $logos[$i + 1]['dppx'] ) - 0.000001; + $media_query = '(min-resolution: ' . $logos[$i]['dppx'] . 'dppx) and (max-resolution: ' . $upper_bound . 'dppx)'; } else { // Largest dppx - $media_query = '(min-resolution: ' . $logos[ $i ]['dppx'] . 'dppx)'; + $media_query = '(min-resolution: ' . $logos[$i]['dppx'] . 'dppx)'; } - $preloadLinks[ $logos[$i]['src'] ] = [ 'as' => 'image', 'media' => $media_query ]; + $preloadLinks[$logos[$i]['src']] = [ + 'as' => 'image', + 'media' => $media_query + ]; } return $preloadLinks; diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php index a91537fb32..9fad3487f2 100644 --- a/includes/resourceloader/ResourceLoaderWikiModule.php +++ b/includes/resourceloader/ResourceLoaderWikiModule.php @@ -433,7 +433,7 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule { // Avoid including ids or timestamps of revision/page tables so // that versions are not wasted $title = new TitleValue( (int)$row->page_namespace, $row->page_title ); - $titleInfo[ self::makeTitleKey( $title ) ] = [ + $titleInfo[self::makeTitleKey( $title )] = [ 'page_len' => $row->page_len, 'page_latest' => $row->page_latest, 'page_touched' => $row->page_touched, -- 2.20.1