Merge "Split some Language methods to LanguageNameUtils" into REL1_34

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index e808078..80f1629 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -605,6 +605,9 @@ 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,

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 125b917..6396290 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1915,10 +1915,12 @@ function wfIsWindows() {
 /**
  * Check if we are running under HHVM
  *
+ * @deprecated since 1.34, HHVM is no longer supported
  * @return bool
  */
 function wfIsHHVM() {
-       return defined( 'HHVM_VERSION' );
+       // wfDeprecated( __FUNCTION__, '1.34' );
+       return false;
 }
 
 /**

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index ed47b5b..1ee17b2 100644 (file)
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -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(),

diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php
index 63b320e..5daf9ef 100644 (file)
--- a/includes/db/MWLBFactory.php
+++ b/includes/db/MWLBFactory.php
@@ -35,12 +35,10 @@ abstract class MWLBFactory {
        private static $loggedDeprecations = [];
 
        /**
-        * TODO Make this a const when HHVM support is dropped (T192166)
-        *
         * @var array
         * @since 1.34
         */
-       public static $applyDefaultConfigOptions = [
+       public const APPLY_DEFAULT_CONFIG_OPTIONS = [
                'DBcompress',
                'DBDefaultGroup',
                'DBmwschema',
@@ -79,7 +77,7 @@ abstract class MWLBFactory {
                BagOStuff $mainStash,
                WANObjectCache $wanCache
        ) {
-               $options->assertRequiredOptions( self::$applyDefaultConfigOptions );
+               $options->assertRequiredOptions( self::APPLY_DEFAULT_CONFIG_OPTIONS );
 
                global $wgCommandLineMode;