Merge "Make phpunit.php less hackish, and install the listener unconditionally"

diff --combined tests/phpunit/MediaWikiTestCase.php
index 78636b1,383d430..51a3f07
--- 1/tests/phpunit/MediaWikiTestCase.php
--- 2/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@@ -107,9 -107,10 +107,10 @@@ abstract class MediaWikiTestCase extend
        private $loggers = [];
  
        /**
-        * @var LoggerInterface
+        * The CLI arguments passed through from phpunit.php
+        * @var array
         */
-       private $testLogger;
+       private $cliArgs = [];
  
        /**
         * Table name prefixes. Oracle likes it shorter.
@@@ -133,11 -134,6 +134,6 @@@
  
                $this->backupGlobals = false;
                $this->backupStaticAttributes = false;
-               $this->testLogger = self::getTestLogger();
-       }
- 
-       private static function getTestLogger() {
-               return LoggerFactory::getInstance( 'tests-phpunit' );
        }
  
        public function __destruct() {
@@@ -386,13 -382,14 +382,14 @@@
        }
  
        public function run( PHPUnit_Framework_TestResult $result = null ) {
+               if ( $result instanceof MediaWikiTestResult ) {
+                       $this->cliArgs = $result->getMediaWikiCliArgs();
+               }
                $this->overrideMwServices();
  
                $needsResetDB = false;
- 
                if ( !self::$dbSetup || $this->needsDB() ) {
                        // set up a DB connection for this test to use
-                       $this->testLogger->info( "Setting up DB for " . $this->toString() );
  
                        self::$useTemporaryTables = !$this->getCliArg( 'use-normal-tables' );
                        self::$reuseDB = $this->getCliArg( 'reuse-db' );
@@@ -419,12 -416,9 +416,9 @@@
                        $needsResetDB = true;
                }
  
-               $this->testLogger->info( "Starting test " . $this->toString() );
                parent::run( $result );
-               $this->testLogger->info( "Finished test " . $this->toString() );
  
                if ( $needsResetDB ) {
-                       $this->testLogger->info( "Resetting DB" );
                        $this->resetDB( $this->db, $this->tablesUsed );
                }
  
@@@ -1154,7 -1148,6 +1148,6 @@@
         * @since 1.32
         */
        protected function addCoreDBData() {
-               $this->testLogger->info( __METHOD__ );
                if ( $this->db->getType() == 'oracle' ) {
                        # Insert 0 user to prevent FK violations
                        # Anonymous user
@@@ -1677,10 -1670,14 +1670,10 @@@
         */
        private function resetDB( $db, $tablesUsed ) {
                if ( $db ) {
 -                      // NOTE: Do not reset the slot_roles and content_models tables, but let them
 -                      // leak across tests. Resetting them would require to reset all NamedTableStore
 -                      // instances for these tables, of which there may be several beyond the ones
 -                      // known to MediaWikiServices. See T202641.
                        $userTables = [ 'user', 'user_groups', 'user_properties', 'actor' ];
                        $pageTables = [
                                'page', 'revision', 'ip_changes', 'revision_comment_temp', 'comment', 'archive',
 -                              'revision_actor_temp', 'slots', 'content',
 +                              'revision_actor_temp', 'slots', 'content', 'content_models', 'slot_roles',
                        ];
                        $coreDBDataTables = array_merge( $userTables, $pageTables );
  
@@@ -1711,8 -1708,6 +1704,8 @@@
                        }
  
                        if ( array_intersect( $tablesUsed, $coreDBDataTables ) ) {
 +                              // Reset services that may contain information relating to the truncated tables
 +                              $this->overrideMwServices();
                                // Re-add core DB data that was deleted
                                $this->addCoreDBData();
                        }
@@@ -1744,15 -1739,10 +1737,15 @@@
                        $db->delete( $tableName, '*', __METHOD__ );
                }
  
 -              if ( in_array( $db->getType(), [ 'postgres', 'sqlite' ], true ) ) {
 +              if ( $db instanceof DatabasePostgres || $db instanceof DatabaseSqlite ) {
                        // Reset the table's sequence too.
                        $db->resetSequenceForTable( $tableName, __METHOD__ );
                }
 +
 +              // re-initialize site_stats table
 +              if ( $tableName === 'site_stats' ) {
 +                      SiteStatsInit::doPlaceholderInit();
 +              }
        }
  
        private static function unprefixTable( &$tableName, $ind, $prefix ) {
@@@ -1838,11 -1828,7 +1831,7 @@@
         * @return mixed
         */
        public function getCliArg( $offset ) {
-               if ( isset( PHPUnitMaintClass::$additionalOptions[$offset] ) ) {
-                       return PHPUnitMaintClass::$additionalOptions[$offset];
-               }
- 
-               return null;
+               return $this->cliArgs[$offset] ?? null;
        }
  
        /**
@@@ -1851,7 -1837,7 +1840,7 @@@
         * @param mixed $value
         */
        public function setCliArg( $offset, $value ) {
-               PHPUnitMaintClass::$additionalOptions[$offset] = $value;
+               $this->cliArgs[$offset] = $value;
        }
  
        /**