X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderImage.php;h=87e5fd7b829ea2f301f77fddfa08a1d5aa9cab26;hb=4884f1a54796067cf53d4feb17795845b455137c;hp=9d5fe38d2222ec4698d01d0b90e185b5509ac604;hpb=38ba6b620be9f6333d902055ae1c0c610af4985e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderImage.php b/includes/resourceloader/ResourceLoaderImage.php
index 9d5fe38d22..87e5fd7b82 100644
--- 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
@@ -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->load( $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
 			);