Merge "Split some Language methods to LanguageNameUtils" into REL1_34

diff --combined RELEASE-NOTES-1.34
index 7a17a99,e808078..80f1629
--- 1/RELEASE-NOTES-1.34
--- 2/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@@ -605,11 -605,13 +605,16 @@@ because of Phabricator reports
    ApiQueryBlockInfoTrait instead.
  * PasswordReset is now a service, its direct instantiation is deprecated.
  * RESTBagOStuff users should specify either "JSON" or "PHP" serialization type.
 +* The global function wfIsHHVM() is deprecated and will now always return false
 +  regardless of the runtime environment. This is part of the continuing work to
 +  remove HHVM support from MediaWiki, which started in MediaWiki 1.31.
  * Language::getLocalisationCache() is deprecated. Use MediaWikiServices
    instead.
+ * The following Language methods are deprecated: isSupportedLanguage,
+   isValidCode, isValidBuiltInCode, isKnownLanguageTag, fetchLanguageNames,
+   fetchLanguageName, getFileName, getMessagesFileName, getJsonMessagesFileName.
+   Use the new LanguageNameUtils class instead. (Note that fetchLanguageName(s)
+   are called getLanguageName(s) in the new class.)
  
  === Other changes in 1.34 ===
  * Added option to specify "Various authors" as author in extension credits using

diff --combined includes/ServiceWiring.php
index e0db05b,ed47b5b..1ee17b2
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -56,6 -56,7 +56,7 @@@ use MediaWiki\FileBackend\LockManager\L
  use MediaWiki\Http\HttpRequestFactory;
  use MediaWiki\Interwiki\ClassicInterwikiLookup;
  use MediaWiki\Interwiki\InterwikiLookup;
+ use MediaWiki\Languages\LanguageNameUtils;
  use MediaWiki\Linker\LinkRenderer;
  use MediaWiki\Linker\LinkRendererFactory;
  use MediaWiki\Logger\LoggerFactory;
@@@ -199,7 -200,7 +200,7 @@@ return 
  
                $lbConf = MWLBFactory::applyDefaultConfig(
                        $mainConfig->get( 'LBFactoryConf' ),
 -                      new ServiceOptions( MWLBFactory::$applyDefaultConfigOptions, $mainConfig ),
 +                      new ServiceOptions( MWLBFactory::APPLY_DEFAULT_CONFIG_OPTIONS, $mainConfig ),
                        $services->getConfiguredReadOnlyMode(),
                        $services->getLocalServerObjectCache(),
                        $services->getMainObjectStash(),
@@@ -259,6 -260,13 +260,13 @@@
                );
        },
  
+       'LanguageNameUtils' => function ( MediaWikiServices $services ) : LanguageNameUtils {
+               return new LanguageNameUtils( new ServiceOptions(
+                       LanguageNameUtils::$constructorOptions,
+                       $services->getMainConfig()
+               ) );
+       },
+ 
        'LinkCache' => function ( MediaWikiServices $services ) : LinkCache {
                return new LinkCache(
                        $services->getTitleFormatter(),
@@@ -313,7 -321,8 +321,8 @@@
                        $logger,
                        [ function () use ( $services ) {
                                $services->getResourceLoader()->getMessageBlobStore()->clear();
-                       } ]
+                       } ],
+                       $services->getLanguageNameUtils()
                );
        },