From ec76c5b50e998c6249fd1334abf595e509cee996 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Wed, 23 May 2018 19:28:33 -0700 Subject: [PATCH] Switch includes/{preferences,services,session,shell} to use the PSR-4 autoloader Change-Id: Ic095ed65d05517cdb7b383cde8c664044f790f05 --- autoload.php | 30 ------------------------------ includes/AutoLoader.php | 4 ++++ 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/autoload.php b/autoload.php index 98c8e405c9..dbc1244498 100644 --- a/autoload.php +++ b/autoload.php @@ -917,39 +917,9 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\Logger\\Spi' => __DIR__ . '/includes/debug/logger/Spi.php', 'MediaWiki\\MediaWikiServices' => __DIR__ . '/includes/MediaWikiServices.php', 'MediaWiki\\OutputHandler' => __DIR__ . '/includes/OutputHandler.php', - 'MediaWiki\\Preferences\\DefaultPreferencesFactory' => __DIR__ . '/includes/preferences/DefaultPreferencesFactory.php', - 'MediaWiki\\Preferences\\PreferencesFactory' => __DIR__ . '/includes/preferences/PreferencesFactory.php', 'MediaWiki\\ProcOpenError' => __DIR__ . '/includes/exception/ProcOpenError.php', 'MediaWiki\\Search\\ParserOutputSearchDataExtractor' => __DIR__ . '/includes/search/ParserOutputSearchDataExtractor.php', - 'MediaWiki\\Services\\CannotReplaceActiveServiceException' => __DIR__ . '/includes/services/CannotReplaceActiveServiceException.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\\SalvageableService' => __DIR__ . '/includes/services/SalvageableService.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', - 'MediaWiki\\Session\\MetadataMergeException' => __DIR__ . '/includes/session/MetadataMergeException.php', - 'MediaWiki\\Session\\PHPSessionHandler' => __DIR__ . '/includes/session/PHPSessionHandler.php', - 'MediaWiki\\Session\\Session' => __DIR__ . '/includes/session/Session.php', - 'MediaWiki\\Session\\SessionBackend' => __DIR__ . '/includes/session/SessionBackend.php', - 'MediaWiki\\Session\\SessionId' => __DIR__ . '/includes/session/SessionId.php', - 'MediaWiki\\Session\\SessionInfo' => __DIR__ . '/includes/session/SessionInfo.php', - 'MediaWiki\\Session\\SessionManager' => __DIR__ . '/includes/session/SessionManager.php', - 'MediaWiki\\Session\\SessionManagerInterface' => __DIR__ . '/includes/session/SessionManagerInterface.php', - 'MediaWiki\\Session\\SessionProvider' => __DIR__ . '/includes/session/SessionProvider.php', - 'MediaWiki\\Session\\SessionProviderInterface' => __DIR__ . '/includes/session/SessionProviderInterface.php', - 'MediaWiki\\Session\\Token' => __DIR__ . '/includes/session/Token.php', - 'MediaWiki\\Session\\UserInfo' => __DIR__ . '/includes/session/UserInfo.php', 'MediaWiki\\ShellDisabledError' => __DIR__ . '/includes/exception/ShellDisabledError.php', - 'MediaWiki\\Shell\\Command' => __DIR__ . '/includes/shell/Command.php', - 'MediaWiki\\Shell\\CommandFactory' => __DIR__ . '/includes/shell/CommandFactory.php', - 'MediaWiki\\Shell\\FirejailCommand' => __DIR__ . '/includes/shell/FirejailCommand.php', - 'MediaWiki\\Shell\\Result' => __DIR__ . '/includes/shell/Result.php', - 'MediaWiki\\Shell\\Shell' => __DIR__ . '/includes/shell/Shell.php', 'MediaWiki\\Site\\MediaWikiPageNameNormalizer' => __DIR__ . '/includes/site/MediaWikiPageNameNormalizer.php', 'MediaWiki\\Sparql\\SparqlClient' => __DIR__ . '/includes/sparql/SparqlClient.php', 'MediaWiki\\Sparql\\SparqlException' => __DIR__ . '/includes/sparql/SparqlException.php', diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index f1a8945528..88c774573f 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -131,6 +131,10 @@ class AutoLoader { 'MediaWiki\\Edit\\' => __DIR__ . '/edit/', 'MediaWiki\\EditPage\\' => __DIR__ . '/editpage/', 'MediaWiki\\Linker\\' => __DIR__ .'/linker/', + 'MediaWiki\\Preferences\\' => __DIR__ .'/preferences/', + 'MediaWiki\\Services\\' => __DIR__ .'/services/', + 'MediaWiki\\Session\\' => __DIR__ .'/session/', + 'MediaWiki\\Shell\\' => __DIR__ .'/shell/', ]; } } -- 2.20.1