jenkins-bot has submitted this change and it was merged.

Change subject: MWServices load new ServiceWiringFiles after ExtRegistry load
......................................................................


MWServices load new ServiceWiringFiles after ExtRegistry load

Extensions that include ServiceWiringFiles in their
extension.json file do not currently get loaded.
This is due to the resetGlobalInstance call after
the extension.json files are loaded not reloading
service wiring.

Adding the 'load' param resolves this.

The current sequence of events is as follows:
 - Setup.php
 - ExtensionRegistry::loadFromQueue
 - ExtensionRegistry::exportExtractedData
 - MediawikiServices::resetGlobalInstance

This can be tested using the Cognate extension
(linked in the ticket) which may be the first extension
to use both extension registration while including
service wiring files.

Bug: T148419
Change-Id: Ic42ac8e28c66b79193bcafe332b1ef2ebc29742d
---
M includes/MediaWikiServices.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  Tobias Gritschacher: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index 7f94ced..3a95676 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -182,7 +182,7 @@
 
                $oldInstance = self::$instance;
 
-               self::$instance = self::newInstance( $bootstrapConfig );
+               self::$instance = self::newInstance( $bootstrapConfig, 'load' );
                self::$instance->importWiring( $oldInstance, [ 
'BootstrapConfig' ] );
 
                if ( $quick === 'quick' ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/316540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic42ac8e28c66b79193bcafe332b1ef2ebc29742d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to