Merge "Introduce ContentLanguage service to replace $wgContLang"

diff --combined tests/phpunit/MediaWikiTestCase.php
index 5416d95,ebca9df..366806e
--- 1/tests/phpunit/MediaWikiTestCase.php
--- 2/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@@ -97,12 -97,6 +97,12 @@@ abstract class MediaWikiTestCase extend
         */
        private $mwGlobalsToUnset = [];
  
 +      /**
 +       * Holds original contents of interwiki table
 +       * @var IResultWrapper
 +       */
 +      private $interwikiTable = null;
 +
        /**
         * Holds original loggers which have been replaced by setLogger()
         * @var LoggerInterface[]
@@@ -569,12 -563,6 +569,12 @@@
                        }
                }
  
 +              // Store contents of interwiki table in case it changes.  Unfortunately, we seem to have no
 +              // way to do this only when needed, because tablesUsed can be changed mid-test.
 +              if ( $this->db ) {
 +                      $this->interwikiTable = $this->db->select( 'interwiki', '*', '', __METHOD__ );
 +              }
 +
                // Reset all caches between tests.
                $this->doLightweightServiceReset();
  
@@@ -628,12 -616,6 +628,12 @@@
                foreach ( $this->mwGlobalsToUnset as $value ) {
                        unset( $GLOBALS[$value] );
                }
 +              if (
 +                      array_key_exists( 'wgExtraNamespaces', $this->mwGlobals ) ||
 +                      in_array( 'wgExtraNamespaces', $this->mwGlobalsToUnset )
 +              ) {
 +                      $this->resetNamespaces();
 +              }
                $this->mwGlobals = [];
                $this->mwGlobalsToUnset = [];
                $this->restoreLoggers();
@@@ -704,6 -686,10 +704,10 @@@
                                return $object;
                        }
                );
+ 
+               if ( $name === 'ContentLanguage' ) {
+                       $this->doSetMwGlobals( [ 'wgContLang' => $object ] );
+               }
        }
  
        /**
@@@ -746,31 -732,25 +750,45 @@@
                        $pairs = [ $pairs => $value ];
                }
  
+               if ( isset( $pairs['wgContLang'] ) ) {
+                       throw new MWException(
+                               'No setting $wgContLang, use setContentLang() or setService( \'ContentLanguage\' )'
+                       );
+               }
+ 
+               $this->doSetMwGlobals( $pairs, $value );
+       }
+ 
+       /**
+        * An internal method that allows setService() to set globals that tests are not supposed to
+        * touch.
+        */
+       private function doSetMwGlobals( $pairs, $value = null ) {
                $this->stashMwGlobals( array_keys( $pairs ) );
  
                foreach ( $pairs as $key => $value ) {
                        $GLOBALS[$key] = $value;
                }
 +
 +              if ( array_key_exists( 'wgExtraNamespaces', $pairs ) ) {
 +                      $this->resetNamespaces();
 +              }
 +      }
 +
 +      /**
 +       * Must be called whenever namespaces are changed, e.g., $wgExtraNamespaces is altered.
 +       * Otherwise old namespace data will lurk and cause bugs.
 +       */
 +      private function resetNamespaces() {
 +              MWNamespace::clearCaches();
 +              Language::clearCaches();
 +
 +              // We can't have the TitleFormatter holding on to an old Language object either
 +              // @todo We shouldn't need to reset all the aliases here.
 +              $services = MediaWikiServices::getInstance();
 +              $services->resetServiceForTesting( 'TitleFormatter' );
 +              $services->resetServiceForTesting( 'TitleParser' );
 +              $services->resetServiceForTesting( '_MediaWikiTitleCodec' );
        }
  
        /**
@@@ -984,10 -964,8 +1002,8 @@@
                        $langCode = $lang;
                        $langObj = Language::factory( $langCode );
                }
-               $this->setMwGlobals( [
-                       'wgLanguageCode' => $langCode,
-                       'wgContLang' => $langObj,
-               ] );
+               $this->setMwGlobals( 'wgLanguageCode', $langCode );
+               $this->setService( 'ContentLanguage', $langObj );
        }
  
        /**
@@@ -1745,6 -1723,11 +1761,6 @@@
  
                        $truncate = in_array( $db->getType(), [ 'oracle', 'mysql' ] );
                        foreach ( $tablesUsed as $tbl ) {
 -                              // TODO: reset interwiki table to its original content.
 -                              if ( $tbl == 'interwiki' ) {
 -                                      continue;
 -                              }
 -
                                if ( !$db->tableExists( $tbl ) ) {
                                        continue;
                                }
@@@ -1760,19 -1743,6 +1776,19 @@@
                                        $db->resetSequenceForTable( $tbl, __METHOD__ );
                                }
  
 +                              if ( $tbl === 'interwiki' ) {
 +                                      if ( !$this->interwikiTable ) {
 +                                              // @todo We should probably throw here, but this causes test failures that I
 +                                              // can't figure out, so for now we silently continue.
 +                                              continue;
 +                                      }
 +                                      $db->insert(
 +                                              'interwiki',
 +                                              array_map( 'get_object_vars', iterator_to_array( $this->interwikiTable ) ),
 +                                              __METHOD__
 +                                      );
 +                              }
 +
                                if ( $tbl === 'page' ) {
                                        // Forget about the pages since they don't
                                        // exist in the DB.
@@@ -2216,18 -2186,6 +2232,18 @@@
                return $loaded;
        }
  
 +      /**
 +       * Skip the test if using the specified database type
 +       *
 +       * @param string $type Database type
 +       * @since 1.32
 +       */
 +      protected function markTestSkippedIfDbType( $type ) {
 +              if ( $this->db->getType() === $type ) {
 +                      $this->markTestSkipped( "The $type database type isn't supported for this test" );
 +              }
 +      }
 +
        /**
         * Used as a marker to prevent wfResetOutputBuffers from breaking PHPUnit.
         * @param string $buffer