HHVM removal: Deprecate and simplify wfIsHHVM()

Change-Id: I81b15d3ae66f070a8a1286627973a339cc08e86b
(cherry picked from commit c00e7cd793c72875ed0cadd89aa48b033cca2571)

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index e98af0a..7a17a99 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.
   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.
 
 * Language::getLocalisationCache() is deprecated. Use MediaWikiServices
   instead.
 

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
  *
 /**
  * Check if we are running under HHVM
  *

+ * @deprecated since 1.34, HHVM is no longer supported

  * @return bool
  */
 function wfIsHHVM() {
  * @return bool
  */
 function wfIsHHVM() {

-       return defined( 'HHVM_VERSION' );
+       // wfDeprecated( __FUNCTION__, '1.34' );
+       return false;

 }
 
 /**
 }
 
 /**