jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398015 )
Change subject: Avoid using array_map in ExtensionRegistry and
ExtensionProcessor for simple operations
......................................................................
Avoid using array_map in ExtensionRegistry and ExtensionProcessor for simple
operations
Bug: T182645
Change-Id: Ia98b1d798b1f93ca30686c009d479668616229ae
---
M includes/registration/ExtensionProcessor.php
M includes/registration/ExtensionRegistry.php
2 files changed, 10 insertions(+), 8 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/registration/ExtensionProcessor.php
b/includes/registration/ExtensionProcessor.php
index 5dc0b40..fe617c5 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -378,9 +378,10 @@
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 bc2f8e4..994de97 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -413,13 +413,14 @@
* 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;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/398015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia98b1d798b1f93ca30686c009d479668616229ae
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Eflyjason <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
