Move user options related classes into its own namespace

There are a couple of user options related classes already,
and the T321527 work on dynamic defaults is going to add
even more. Let's move them into a separate namespace
to make core a bit more organized.

Old name is kept as an alias for compatibility purposes.

Bug: T321527
Bug: T352284
Change-Id: I9822eb1553870b876d0b8a927e4e86c27d83bd52

3 files changed, 24 insertions, 3 deletions

diff --git a/includes/user/DefaultOptionsLookup.php b/includes/user/Options/DefaultOptionsLookup.php
index 08cdb4ab98a3..a886a35481fd 100644
--- a/includes/user/DefaultOptionsLookup.php
+++ b/includes/user/Options/DefaultOptionsLookup.php
@@ -18,7 +18,7 @@
  * @file
  */
 
-namespace MediaWiki\User;
+namespace MediaWiki\User\Options;
 
 use Language;
 use LanguageConverter;
@@ -27,6 +27,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Title\NamespaceInfo;
+use MediaWiki\User\UserIdentity;
 use Skin;
 use Wikimedia\Assert\Assert;
 
@@ -167,3 +168,8 @@ class DefaultOptionsLookup extends UserOptionsLookup {
 		);
 	}
 }
+
+/**
+ * @deprecated since 1.42
+ */
+class_alias( DefaultOptionsLookup::class, 'MediaWiki\\User\\DefaultOptionsLookup' );
diff --git a/includes/user/UserOptionsLookup.php b/includes/user/Options/UserOptionsLookup.php
index 39c3845e68e3..68b498a7b62d 100644
--- a/includes/user/UserOptionsLookup.php
+++ b/includes/user/Options/UserOptionsLookup.php
@@ -18,9 +18,10 @@
  * @file
  */
 
-namespace MediaWiki\User;
+namespace MediaWiki\User\Options;
 
 use IDBAccessObject;
+use MediaWiki\User\UserIdentity;
 
 /**
  * Provides access to user options
@@ -130,3 +131,8 @@ abstract class UserOptionsLookup implements IDBAccessObject {
 		return intval( $val );
 	}
 }
+
+/**
+ * @deprecated since 1.42
+ */
+class_alias( UserOptionsLookup::class, 'MediaWiki\\User\\UserOptionsLookup' );
diff --git a/includes/user/UserOptionsManager.php b/includes/user/Options/UserOptionsManager.php
index f3dc77e97241..8c130b9a9a98 100644
--- a/includes/user/UserOptionsManager.php
+++ b/includes/user/Options/UserOptionsManager.php
@@ -18,7 +18,7 @@
  * @file
  */
 
-namespace MediaWiki\User;
+namespace MediaWiki\User\Options;
 
 use DBAccessObjectUtils;
 use HTMLCheckMatrix;
@@ -34,6 +34,10 @@ use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\User\UserFactory;
+use MediaWiki\User\UserIdentity;
+use MediaWiki\User\UserNameUtils;
+use MediaWiki\User\UserTimeCorrection;
 use Psr\Log\LoggerInterface;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;
@@ -705,3 +709,8 @@ class UserOptionsManager extends UserOptionsLookup {
 		return (string)$a === (string)$b;
 	}
 }
+
+/**
+ * @deprecated since 1.42
+ */
+class_alias( UserOptionsManager::class, 'MediaWiki\\User\\UserOptionsManager' );