Merge "Fix display of action table cells on Special:Tags"

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderImage.php

diff --git a/includes/resourceloader/ResourceLoaderImage.php b/includes/resourceloader/ResourceLoaderImage.php
index 1f35e1f..2503b22 100644 (file)
--- a/includes/resourceloader/ResourceLoaderImage.php
+++ b/includes/resourceloader/ResourceLoaderImage.php
@@ -31,12 +31,12 @@ class ResourceLoaderImage {
         * Map of allowed file extensions to their MIME types.
         * @var array
         */
-       protected static $fileTypes = array(
+       protected static $fileTypes = [
                'svg' => 'image/svg+xml',
                'png' => 'image/png',
                'gif' => 'image/gif',
                'jpg' => 'image/jpg',
-       );
+       ];
 
        /**
         * @param string $name Image name
@@ -54,8 +54,8 @@ class ResourceLoaderImage {
                $this->variants = $variants;
 
                // Expand shorthands:
-               // array( "en,de,fr" => "foo.svg" )
-               // → array( "en" => "foo.svg", "de" => "foo.svg", "fr" => "foo.svg" )
+               // [ "en,de,fr" => "foo.svg" ]
+               // → [ "en" => "foo.svg", "de" => "foo.svg", "fr" => "foo.svg" ]
                if ( is_array( $this->descriptor ) && isset( $this->descriptor['lang'] ) ) {
                        foreach ( array_keys( $this->descriptor['lang'] ) as $langList ) {
                                if ( strpos( $langList, ',' ) !== false ) {
@@ -69,7 +69,7 @@ class ResourceLoaderImage {
                }
 
                // Ensure that all files have common extension.
-               $extensions = array();
+               $extensions = [];
                $descriptor = (array)$descriptor;
                array_walk_recursive( $descriptor, function ( $path ) use ( &$extensions ) {
                        $extensions[] = pathinfo( $path, PATHINFO_EXTENSION );
@@ -170,16 +170,16 @@ class ResourceLoaderImage {
         * @return string
         */
        public function getUrl( ResourceLoaderContext $context, $script, $variant, $format ) {
-               $query = array(
+               $query = [
                        'modules' => $this->getModule(),
                        'image' => $this->getName(),
                        'variant' => $variant,
                        'format' => $format,
                        'lang' => $context->getLanguage(),
                        'version' => $context->getVersion(),
-               );
+               ];
 
-               return wfExpandUrl( wfAppendQuery( $script, $query ), PROTO_RELATIVE );
+               return wfAppendQuery( $script, $query );
        }
 
        /**
@@ -272,7 +272,7 @@ class ResourceLoaderImage {
         */
        protected function variantize( $variantConf, ResourceLoaderContext $context ) {
                $dom = new DomDocument;
-               $dom->loadXml( file_get_contents( $this->getPath( $context ) ) );
+               $dom->loadXML( file_get_contents( $this->getPath( $context ) ) );
                $root = $dom->documentElement;
                $wrapper = $dom->createElement( 'g' );
                while ( $root->firstChild ) {
@@ -280,7 +280,7 @@ class ResourceLoaderImage {
                }
                $root->appendChild( $wrapper );
                $wrapper->setAttribute( 'fill', $variantConf['color'] );
-               return $dom->saveXml();
+               return $dom->saveXML();
        }
 
        /**
@@ -295,7 +295,7 @@ class ResourceLoaderImage {
         */
        protected function massageSvgPathdata( $svg ) {
                $dom = new DomDocument;
-               $dom->loadXml( $svg );
+               $dom->loadXML( $svg );
                foreach ( $dom->getElementsByTagName( 'path' ) as $node ) {
                        $pathData = $node->getAttribute( 'd' );
                        // Make sure there is at least one space between numbers, and that leading zero is not omitted.
@@ -305,7 +305,7 @@ class ResourceLoaderImage {
                        $pathData = preg_replace( '/([ -])0(\d)/', '$1$2', $pathData );
                        $node->setAttribute( 'd', $pathData );
                }
-               return $dom->saveXml();
+               return $dom->saveXML();
        }
 
        /**
@@ -346,7 +346,7 @@ class ResourceLoaderImage {
 
                        $process = proc_open(
                                $command,
-                               array( 0 => array( 'pipe', 'r' ), 1 => array( 'pipe', 'w' ) ),
+                               [ 0 => [ 'pipe', 'r' ], 1 => [ 'pipe', 'w' ] ],
                                $pipes
                        );