Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/314420
Change subject: Merge commit 'd7410db' into REL1_27
......................................................................
Merge commit 'd7410db' into REL1_27
* commit 'd7410db':
Allow reset of global services (redux).
Bug: T147511
Change-Id: I02921d0399a847f4af6ac62604594d79581a3af1
---
M autoload.php
1 file changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/20/314420/1
diff --git a/autoload.php b/autoload.php
index 373082a..2a22b7d 100644
--- a/autoload.php
+++ b/autoload.php
@@ -639,6 +639,7 @@
'KkConverter' => __DIR__ . '/languages/classes/LanguageKk.php',
'KuConverter' => __DIR__ . '/languages/classes/LanguageKu.php',
'LBFactory' => __DIR__ . '/includes/db/loadbalancer/LBFactory.php',
+ 'LBFactoryFake' => __DIR__ .
'/includes/db/loadbalancer/LBFactoryFake.php',
'LBFactoryMulti' => __DIR__ .
'/includes/db/loadbalancer/LBFactoryMulti.php',
'LBFactorySimple' => __DIR__ .
'/includes/db/loadbalancer/LBFactorySimple.php',
'LBFactorySingle' => __DIR__ .
'/includes/db/loadbalancer/LBFactorySingle.php',
@@ -789,7 +790,6 @@
'MediaWikiSite' => __DIR__ . '/includes/site/MediaWikiSite.php',
'MediaWikiTitleCodec' => __DIR__ .
'/includes/title/MediaWikiTitleCodec.php',
'MediaWikiVersionFetcher' => __DIR__ .
'/includes/MediaWikiVersionFetcher.php',
-<<<<<<< HEAD (feae8b Detect/use APCu properly)
'MediaWiki\\Auth\\AbstractAuthenticationProvider' => __DIR__ .
'/includes/auth/AbstractAuthenticationProvider.php',
'MediaWiki\\Auth\\AbstractPasswordPrimaryAuthenticationProvider' =>
__DIR__ . '/includes/auth/AbstractPasswordPrimaryAuthenticationProvider.php',
'MediaWiki\\Auth\\AbstractPreAuthenticationProvider' => __DIR__ .
'/includes/auth/AbstractPreAuthenticationProvider.php',
@@ -825,9 +825,6 @@
'MediaWiki\\Auth\\Throttler' => __DIR__ .
'/includes/auth/Throttler.php',
'MediaWiki\\Auth\\UserDataAuthenticationRequest' => __DIR__ .
'/includes/auth/UserDataAuthenticationRequest.php',
'MediaWiki\\Auth\\UsernameAuthenticationRequest' => __DIR__ .
'/includes/auth/UsernameAuthenticationRequest.php',
-=======
- 'MediaWiki\\MediaWikiServices' => __DIR__ .
'/includes/MediaWikiServices.php',
->>>>>>> BRANCH (d7410d Allow reset of global services (redux).)
'MediaWiki\\Languages\\Data\\Names' => __DIR__ .
'/languages/data/Names.php',
'MediaWiki\\Languages\\Data\\ZhConversion' => __DIR__ .
'/languages/data/ZhConversion.php',
'MediaWiki\\Linker\\LinkTarget' => __DIR__ .
'/includes/linker/LinkTarget.php',
@@ -845,13 +842,14 @@
'MediaWiki\\Logger\\Monolog\\WikiProcessor' => __DIR__ .
'/includes/debug/logger/monolog/WikiProcessor.php',
'MediaWiki\\Logger\\NullSpi' => __DIR__ .
'/includes/debug/logger/NullSpi.php',
'MediaWiki\\Logger\\Spi' => __DIR__ . '/includes/debug/logger/Spi.php',
- 'MediaWiki\\Services\\DestructibleService' => __DIR__ .
'/includes/Services/DestructibleService.php',
- 'MediaWiki\\Services\\ServiceContainer' => __DIR__ .
'/includes/Services/ServiceContainer.php',
- 'MediaWiki\\Services\\NoSuchServiceException' => __DIR__ .
'/includes/Services/NoSuchServiceException.php',
+ 'MediaWiki\\MediaWikiServices' => __DIR__ .
'/includes/MediaWikiServices.php',
'MediaWiki\\Services\\CannotReplaceActiveServiceException' => __DIR__ .
'/includes/Services/CannotReplaceActiveServiceException.php',
- 'MediaWiki\\Services\\ServiceAlreadyDefinedException' => __DIR__ .
'/includes/Services/ServiceAlreadyDefinedException.php',
- 'MediaWiki\\Services\\ServiceDisabledException' => __DIR__ .
'/includes/Services/ServiceDisabledException.php',
'MediaWiki\\Services\\ContainerDisabledException' => __DIR__ .
'/includes/Services/ContainerDisabledException.php',
+ 'MediaWiki\\Services\\DestructibleService' => __DIR__ .
'/includes/Services/DestructibleService.php',
+ 'MediaWiki\\Services\\NoSuchServiceException' => __DIR__ .
'/includes/Services/NoSuchServiceException.php',
+ 'MediaWiki\\Services\\ServiceAlreadyDefinedException' => __DIR__ .
'/includes/Services/ServiceAlreadyDefinedException.php',
+ 'MediaWiki\\Services\\ServiceContainer' => __DIR__ .
'/includes/Services/ServiceContainer.php',
+ 'MediaWiki\\Services\\ServiceDisabledException' => __DIR__ .
'/includes/Services/ServiceDisabledException.php',
'MediaWiki\\Session\\BotPasswordSessionProvider' => __DIR__ .
'/includes/session/BotPasswordSessionProvider.php',
'MediaWiki\\Session\\CookieSessionProvider' => __DIR__ .
'/includes/session/CookieSessionProvider.php',
'MediaWiki\\Session\\ImmutableSessionProviderWithCookie' => __DIR__ .
'/includes/session/ImmutableSessionProviderWithCookie.php',
--
To view, visit https://gerrit.wikimedia.org/r/314420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02921d0399a847f4af6ac62604594d79581a3af1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
