Merge "includes/libs: Replace implicit Bugzilla bug numbers with Phab ones"

diff --combined includes/libs/rdbms/database/Database.php
index a7952a6,9ec0b20..50522ef
--- 1/includes/libs/rdbms/database/Database.php
--- 2/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@@ -846,7 -846,7 +846,7 @@@ abstract class Database implements IDat
                }
  
                // Add trace comment to the begin of the sql string, right after the operator.
-               // Or, for one-word queries (like "BEGIN" or COMMIT") add it to the end (bug 42598)
+               // Or, for one-word queries (like "BEGIN" or COMMIT") add it to the end (T44598)
                $commentedSql = preg_replace( '/\s|$/', " /* $fname {$this->agent} */ ", $sql, 1 );
  
                # Start implicit transactions that wrap the request if DBO_TRX is enabled
@@@ -1025,8 -1025,8 +1025,8 @@@
  
        private function handleSessionLoss() {
                $this->mTrxLevel = 0;
-               $this->mTrxIdleCallbacks = []; // bug 65263
-               $this->mTrxPreCommitCallbacks = []; // bug 65263
+               $this->mTrxIdleCallbacks = []; // T67263
+               $this->mTrxPreCommitCallbacks = []; // T67263
                $this->mSessionTempTables = [];
                $this->mNamedLocksHeld = [];
                try {
@@@ -1141,6 -1141,12 +1141,6 @@@
  
                $preLimitTail .= $this->makeOrderBy( $options );
  
 -              // if (isset($options['LIMIT'])) {
 -              //      $tailOpts .= $this->limitResult('', $options['LIMIT'],
 -              //              isset($options['OFFSET']) ? $options['OFFSET']
 -              //              : false);
 -              // }
 -
                if ( isset( $noKeyOptions['FOR UPDATE'] ) ) {
                        $postLimitTail .= ' FOR UPDATE';
                }
@@@ -3461,4 -3467,4 +3461,4 @@@
        }
  }
  
 -class_alias( 'Database', 'DatabaseBase' );
 +class_alias( Database::class, 'DatabaseBase' );

diff --combined includes/libs/rdbms/database/DatabasePostgres.php
index c62fec1,f730d14..7b8a940
--- 1/includes/libs/rdbms/database/DatabasePostgres.php
--- 2/includes/libs/rdbms/database/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@@ -985,7 -985,7 +985,7 @@@ __INDEXATTR__
                                /**
                                 * Prepend our schema (e.g. 'mediawiki') in front
                                 * of the search path
-                                * Fixes bug 15816
+                                * Fixes T17816
                                 */
                                $search_path = $this->getSearchPath();
                                array_unshift( $search_path,
@@@ -1026,7 -1026,7 +1026,7 @@@
                                // Normal client
                                $this->numericVersion = $versionInfo['server'];
                        } else {
-                               // Bug 16937: broken pgsql extension from PHP<5.3
+                               // T18937: broken pgsql extension from PHP<5.3
                                $this->numericVersion = pg_parameter_status( $conn, 'server_version' );
                        }
                }
@@@ -1079,8 -1079,8 +1079,8 @@@
                $q = <<<SQL
        SELECT 1 FROM pg_class, pg_namespace, pg_trigger
                WHERE relnamespace=pg_namespace.oid AND relkind='r'
 -                        AND tgrelid=pg_class.oid
 -                        AND nspname=%s AND relname=%s AND tgname=%s
 +                      AND tgrelid=pg_class.oid
 +                      AND nspname=%s AND relname=%s AND tgname=%s
  SQL;
                $res = $this->query(
                        sprintf(
@@@ -1252,6 -1252,12 +1252,6 @@@
  
                $preLimitTail .= $this->makeOrderBy( $options );
  
 -              // if ( isset( $options['LIMIT'] ) ) {
 -              //      $tailOpts .= $this->limitResult( '', $options['LIMIT'],
 -              //              isset( $options['OFFSET'] ) ? $options['OFFSET']
 -              //              : false );
 -              // }
 -
                if ( isset( $options['FOR UPDATE'] ) ) {
                        $postLimitTail .= ' FOR UPDATE OF ' .
                                implode( ', ', array_map( [ $this, 'tableName' ], $options['FOR UPDATE'] ) );

diff --combined includes/libs/rdbms/lbfactory/LBFactory.php
index c4229bc,6d2605f..f05dabc
--- 1/includes/libs/rdbms/lbfactory/LBFactory.php
--- 2/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@@ -31,6 -31,7 +31,6 @@@ use WANObjectCache
  use Exception;
  use RuntimeException;
  use IDatabase;
 -use LoadBalancer;
  use DBTransactionError;
  use DBReplicationWaitError;
  
@@@ -336,7 -337,7 +336,7 @@@ abstract class LBFactory implements ILB
                $masterPositions = array_fill( 0, count( $lbs ), false );
                foreach ( $lbs as $i => $lb ) {
                        if ( $lb->getServerCount() <= 1 ) {
-                               // Bug 27975 - Don't try to wait for replica DBs if there are none
+                               // T29975 - Don't try to wait for replica DBs if there are none
                                // Prevents permission error when getting master position
                                continue;
                        } elseif ( $opts['ifWritesSince']