From: umherirrender <umherirrender_de.wp@web.de>
Date: Thu, 30 Jan 2014 18:39:51 +0000 (+0100)
Subject: Unroll array_map in ResourceLoaderFileModule::readStyleFiles
X-Git-Tag: 1.31.0-rc.0~16874^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=add8b9a97651701b7a0b3fe1d03f8244ae4e8ebd;p=lhc%2Fweb%2Fwiklou.git

Unroll array_map in ResourceLoaderFileModule::readStyleFiles

ResourceLoaderFileModule::readStyleFile can throw exceptions which
produces warnings when using array_map.

Produces useful stacktraces when there are issues with style file like LESS compilation errors

Bug: 47844
Bug: 59858
Change-Id: I7c48b2c94752eee81f0eeb8e00d1f2b526d80dfc
---

diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php
index eaff86feff..23d58250fa 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -674,6 +674,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 	 *
 	 * @param bool $flip
 	 *
+	 * @throws MWException
 	 * @return array: List of concatenated and remapped CSS data from $styles,
 	 *     keyed by media type
 	 */
@@ -683,14 +684,11 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 		}
 		foreach ( $styles as $media => $files ) {
 			$uniqueFiles = array_unique( $files );
-			$styles[$media] = implode(
-				"\n",
-				array_map(
-					array( $this, 'readStyleFile' ),
-					$uniqueFiles,
-					array_fill( 0, count( $uniqueFiles ), $flip )
-				)
-			);
+			$styleFiles = array();
+			foreach ( $uniqueFiles as $file ) {
+				$styleFiles[] = $this->readStyleFile( $file, $flip );
+			}
+			$styles[$media] = implode( "\n", $styleFiles );
 		}
 		return $styles;
 	}