From c822159cb419aa3de18d15d142fcce7a24b6f166 Mon Sep 17 00:00:00 2001
From: Amir Sarabadani <ladsgroup@gmail.com>
Date: Sat, 19 Aug 2023 11:15:34 +0200
Subject: [PATCH] Reorg: Move ExtensionInfo to utils/

Bug: T321882
Change-Id: I5d0539821ded4ed9f2698ecbc76c2678612f1c97
---
 autoload.php                           | 3 ++-
 includes/api/ApiHelp.php               | 2 +-
 includes/api/ApiParamInfo.php          | 2 +-
 includes/api/ApiQuerySiteinfo.php      | 2 +-
 includes/specials/SpecialVersion.php   | 2 +-
 includes/{ => utils}/ExtensionInfo.php | 4 +++-
 6 files changed, 9 insertions(+), 6 deletions(-)
 rename includes/{ => utils}/ExtensionInfo.php (93%)

diff --git a/autoload.php b/autoload.php
index c703e2f4762..0f2a4599360 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1109,7 +1109,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Edit\\SimpleParsoidOutputStash' => __DIR__ . '/includes/edit/SimpleParsoidOutputStash.php',
 	'MediaWiki\\Emptiable' => __DIR__ . '/includes/libs/Emptiable.php',
 	'MediaWiki\\Export\\WikiExporterFactory' => __DIR__ . '/includes/export/WikiExporterFactory.php',
-	'MediaWiki\\ExtensionInfo' => __DIR__ . '/includes/ExtensionInfo.php',
+	'MediaWiki\\ExtensionInfo' => __DIR__ . '/includes/utils/ExtensionInfo.php',
 	'MediaWiki\\ExternalLinks\\ExternalLinksLookup' => __DIR__ . '/includes/ExternalLinks/ExternalLinksLookup.php',
 	'MediaWiki\\ExternalLinks\\LinkFilter' => __DIR__ . '/includes/ExternalLinks/LinkFilter.php',
 	'MediaWiki\\Feed\\AtomFeed' => __DIR__ . '/includes/Feed/AtomFeed.php',
@@ -2164,6 +2164,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\User\\UserRigorOptions' => __DIR__ . '/includes/user/UserRigorOptions.php',
 	'MediaWiki\\User\\UserSelectQueryBuilder' => __DIR__ . '/includes/user/UserSelectQueryBuilder.php',
 	'MediaWiki\\User\\UserTimeCorrection' => __DIR__ . '/includes/user/UserTimeCorrection.php',
+	'MediaWiki\\Utils\\ExtensionInfo' => __DIR__ . '/includes/utils/ExtensionInfo.php',
 	'MediaWiki\\Utils\\MWTimestamp' => __DIR__ . '/includes/utils/MWTimestamp.php',
 	'MediaWiki\\Utils\\UrlUtils' => __DIR__ . '/includes/utils/UrlUtils.php',
 	'MediaWiki\\Watchlist\\WatchlistManager' => __DIR__ . '/includes/watchlist/WatchlistManager.php',
diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index 58c032f9731..98a654f3dc0 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -20,13 +20,13 @@
  * @file
  */
 
-use MediaWiki\ExtensionInfo;
 use MediaWiki\Html\Html;
 use MediaWiki\Html\HtmlHelper;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
+use MediaWiki\Utils\ExtensionInfo;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\Parsoid\Core\TOCData;
 use Wikimedia\RemexHtml\Serializer\SerializerNode;
diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index cba06c3b66c..7553291f9cf 100644
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -20,8 +20,8 @@
  * @file
  */
 
-use MediaWiki\ExtensionInfo;
 use MediaWiki\User\UserFactory;
+use MediaWiki\Utils\ExtensionInfo;
 use Wikimedia\ParamValidator\ParamValidator;
 
 /**
diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 92f7212f132..286bd04f1ff 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -20,7 +20,6 @@
  * @file
  */
 
-use MediaWiki\ExtensionInfo;
 use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\Languages\LanguageFactory;
@@ -34,6 +33,7 @@ use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserGroupManager;
 use MediaWiki\User\UserOptionsLookup;
+use MediaWiki\Utils\ExtensionInfo;
 use MediaWiki\Utils\UrlUtils;
 use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\ParamValidator\ParamValidator;
diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index 8e16ef9a282..7941c3de91c 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -23,7 +23,6 @@
  * @ingroup SpecialPage
  */
 
-use MediaWiki\ExtensionInfo;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Html\Html;
 use MediaWiki\Language\RawMessage;
@@ -31,6 +30,7 @@ use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Parser\ParserOutputFlags;
+use MediaWiki\Utils\ExtensionInfo;
 use MediaWiki\Utils\MWTimestamp;
 use MediaWiki\Utils\UrlUtils;
 use Symfony\Component\Yaml\Yaml;
diff --git a/includes/ExtensionInfo.php b/includes/utils/ExtensionInfo.php
similarity index 93%
rename from includes/ExtensionInfo.php
rename to includes/utils/ExtensionInfo.php
index cc1a2affcf4..3a2e3c1bfd3 100644
--- a/includes/ExtensionInfo.php
+++ b/includes/utils/ExtensionInfo.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MediaWiki;
+namespace MediaWiki\Utils;
 
 /**
  * @since 1.35
@@ -62,3 +62,5 @@ class ExtensionInfo {
 		return $licenseFiles;
 	}
 }
+
+class_alias( ExtensionInfo::class, 'MediaWiki\\ExtensionInfo' );