Merge "Move Database and subclasses to Rdbms namespace"

diff --combined autoload.php
index 0c26811,6c5d27f..bfac50d
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -1260,7 -1260,6 +1260,6 @@@ $wgAutoloadLocalClasses = 
        'SVGReader' => __DIR__ . '/includes/media/SVGMetadataExtractor.php',
        'SamplingStatsdClient' => __DIR__ . '/includes/libs/stats/SamplingStatsdClient.php',
        'Sanitizer' => __DIR__ . '/includes/Sanitizer.php',
-       'SavepointPostgres' => __DIR__ . '/includes/libs/rdbms/database/utils/SavepointPostgres.php',
        'ScopedCallback' => __DIR__ . '/includes/compat/ScopedCallback.php',
        'ScopedLock' => __DIR__ . '/includes/libs/lockmanager/ScopedLock.php',
        'SearchApi' => __DIR__ . '/includes/api/SearchApi.php',
@@@ -1320,7 -1319,6 +1319,7 @@@
        'SpecialAllPages' => __DIR__ . '/includes/specials/SpecialAllPages.php',
        'SpecialApiHelp' => __DIR__ . '/includes/specials/SpecialApiHelp.php',
        'SpecialApiSandbox' => __DIR__ . '/includes/specials/SpecialApiSandbox.php',
 +      'SpecialAutoblockList' => __DIR__ . '/includes/specials/SpecialAutoblockList.php',
        'SpecialBlankpage' => __DIR__ . '/includes/specials/SpecialBlankpage.php',
        'SpecialBlock' => __DIR__ . '/includes/specials/SpecialBlock.php',
        'SpecialBlockList' => __DIR__ . '/includes/specials/SpecialBlockList.php',
@@@ -1597,7 -1595,14 +1596,14 @@@
        'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/ConnectionManager.php',
        'Wikimedia\\Rdbms\\DBConnRef' => __DIR__ . '/includes/libs/rdbms/database/DBConnRef.php',
        'Wikimedia\\Rdbms\\DBMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/DBMasterPos.php',
+       'Wikimedia\\Rdbms\\Database' => __DIR__ . '/includes/libs/rdbms/database/Database.php',
        'Wikimedia\\Rdbms\\DatabaseDomain' => __DIR__ . '/includes/libs/rdbms/database/DatabaseDomain.php',
+       'Wikimedia\\Rdbms\\DatabaseMssql' => __DIR__ . '/includes/libs/rdbms/database/DatabaseMssql.php',
+       'Wikimedia\\Rdbms\\DatabaseMysql' => __DIR__ . '/includes/libs/rdbms/database/DatabaseMysql.php',
+       'Wikimedia\\Rdbms\\DatabaseMysqlBase' => __DIR__ . '/includes/libs/rdbms/database/DatabaseMysqlBase.php',
+       'Wikimedia\\Rdbms\\DatabaseMysqli' => __DIR__ . '/includes/libs/rdbms/database/DatabaseMysqli.php',
+       'Wikimedia\\Rdbms\\DatabasePostgres' => __DIR__ . '/includes/libs/rdbms/database/DatabasePostgres.php',
+       'Wikimedia\\Rdbms\\DatabaseSqlite' => __DIR__ . '/includes/libs/rdbms/database/DatabaseSqlite.php',
        'Wikimedia\\Rdbms\\FakeResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php',
        'Wikimedia\\Rdbms\\Field' => __DIR__ . '/includes/libs/rdbms/field/Field.php',
        'Wikimedia\\Rdbms\\IBlob' => __DIR__ . '/includes/libs/rdbms/encasing/IBlob.php',
@@@ -1627,6 -1632,7 +1633,7 @@@
        'Wikimedia\\Rdbms\\PostgresField' => __DIR__ . '/includes/libs/rdbms/field/PostgresField.php',
        'Wikimedia\\Rdbms\\ResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/ResultWrapper.php',
        'Wikimedia\\Rdbms\\SQLiteField' => __DIR__ . '/includes/libs/rdbms/field/SQLiteField.php',
+       'Wikimedia\\Rdbms\\SavepointPostgres' => __DIR__ . '/includes/libs/rdbms/database/utils/SavepointPostgres.php',
        'Wikimedia\\Rdbms\\SessionConsistentConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php',
        'Wikimedia\\Rdbms\\TransactionProfiler' => __DIR__ . '/includes/libs/rdbms/TransactionProfiler.php',
        'WikitextContent' => __DIR__ . '/includes/content/WikitextContent.php',

diff --combined includes/Title.php
index 95bb1d9,3a25ebe..dd6aaef
--- 1/includes/Title.php
--- 2/includes/Title.php
+++ b/includes/Title.php
@@@ -22,6 -22,7 +22,7 @@@
   * @file
   */
  
+ use Wikimedia\Rdbms\Database;
  use Wikimedia\Rdbms\IDatabase;
  use MediaWiki\Linker\LinkTarget;
  use MediaWiki\Interwiki\InterwikiLookup;
@@@ -2151,7 -2152,8 +2152,7 @@@ class Title implements LinkTarget 
        private function checkCSSandJSPermissions( $action, $user, $errors, $rigor, $short ) {
                # Protect css/js subpages of user pages
                # XXX: this might be better using restrictions
 -              # XXX: right 'editusercssjs' is deprecated, for backward compatibility only
 -              if ( $action != 'patrol' && !$user->isAllowed( 'editusercssjs' ) ) {
 +              if ( $action != 'patrol' ) {
                        if ( preg_match( '/^' . preg_quote( $user->getName(), '/' ) . '\//', $this->mTextform ) ) {
                                if ( $this->isCssSubpage() && !$user->isAllowedAny( 'editmyusercss', 'editusercss' ) ) {
                                        $errors[] = [ 'mycustomcssprotected', $action ];
@@@ -4650,7 -4652,7 +4651,7 @@@
        }
  
        /**
 -       * Whether the magic words __INDEX__ and __NOINDEX__ function for  this page.
 +       * Whether the magic words __INDEX__ and __NOINDEX__ function for this page.
         *
         * @return bool
         */

diff --combined includes/interwiki/ClassicInterwikiLookup.php
index f19e3db,09c426b..5226aa0
--- 1/includes/interwiki/ClassicInterwikiLookup.php
--- 2/includes/interwiki/ClassicInterwikiLookup.php
+++ b/includes/interwiki/ClassicInterwikiLookup.php
@@@ -23,7 -23,7 +23,7 @@@ namespace MediaWiki\Interwiki
   */
  use \Cdb\Exception as CdbException;
  use \Cdb\Reader as CdbReader;
- use Database;
+ use Wikimedia\Rdbms\Database;
  use Hooks;
  use Interwiki;
  use Language;
@@@ -221,7 -221,7 +221,7 @@@ class ClassicInterwikiLookup implement
                                }
                        }
  
 -                      $value = $this->getCacheValue( wfMemcKey( $prefix ) );
 +                      $value = $this->getCacheValue( wfWikiID() . ':' . $prefix );
                        // Site level
                        if ( $value == '' && $this->interwikiScopes >= 3 ) {
                                $value = $this->getCacheValue( "_{$this->thisSite}:{$prefix}" );

diff --combined includes/user/User.php
index e9f6dce,9d1b2d3..30e370e
--- 1/includes/user/User.php
--- 2/includes/user/User.php
+++ b/includes/user/User.php
@@@ -27,6 -27,7 +27,7 @@@ use MediaWiki\Auth\AuthManager
  use MediaWiki\Auth\AuthenticationResponse;
  use MediaWiki\Auth\AuthenticationRequest;
  use Wikimedia\ScopedCallback;
+ use Wikimedia\Rdbms\Database;
  
  /**
   * String Some punctuation to prevent editing from broken text-mangling proxies.
@@@ -146,6 -147,7 +147,6 @@@ class User implements IDBAccessObject 
                'editmyuserjs',
                'editmywatchlist',
                'editsemiprotected',
 -              'editusercssjs', # deprecated
                'editusercss',
                'edituserjs',
                'hideuser',