From: Yifei He <eflyjason@gmail.com>
Date: Wed, 13 Dec 2017 09:41:03 +0000 (+0800)
Subject: Avoid using array_map in ExtensionRegistry and ExtensionProcessor for simple operations
X-Git-Tag: 1.31.0-rc.0~1200
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=b3840b25b3735beb8e73648558eb097189377e1c;p=lhc%2Fweb%2Fwiklou.git

Avoid using array_map in ExtensionRegistry and ExtensionProcessor for simple operations

Bug: T182645
Change-Id: Ia98b1d798b1f93ca30686c009d479668616229ae
---

diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index 5dc0b400fb..fe617c54bb 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -378,9 +378,10 @@ class ExtensionProcessor implements Processor {
 
 	protected function extractExtensionMessagesFiles( $dir, array $info ) {
 		if ( isset( $info['ExtensionMessagesFiles'] ) ) {
-			$this->globals["wgExtensionMessagesFiles"] += array_map( function ( $file ) use ( $dir ) {
-				return "$dir/$file";
-			}, $info['ExtensionMessagesFiles'] );
+			foreach ( $info['ExtensionMessagesFiles'] as &$file ) {
+				$file = "$dir/$file";
+			}
+			$this->globals["wgExtensionMessagesFiles"] += $info['ExtensionMessagesFiles'];
 		}
 	}
 
diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php
index bc2f8e47d3..994de9726f 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -413,13 +413,14 @@ class ExtensionRegistry {
 	 * Fully expand autoloader paths
 	 *
 	 * @param string $dir
-	 * @param array $info
+	 * @param array $files
 	 * @return array
 	 */
-	protected function processAutoLoader( $dir, array $info ) {
+	protected function processAutoLoader( $dir, array $files ) {
 		// Make paths absolute, relative to the JSON file
-		return array_map( function ( $file ) use ( $dir ) {
-			return "$dir/$file";
-		}, $info );
+		foreach ( $files as &$file ) {
+			$file = "$dir/$file";
+		}
+		return $files;
 	}
 }