From 6d5d0c9fb78cb3d436051640af6bd4e8db574512 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Thu, 3 Oct 2019 11:03:46 -0700 Subject: [PATCH] HHVM removal: Deprecate and simplify wfIsHHVM() Change-Id: I81b15d3ae66f070a8a1286627973a339cc08e86b (cherry picked from commit c00e7cd793c72875ed0cadd89aa48b033cca2571) --- RELEASE-NOTES-1.34 | 3 +++ includes/GlobalFunctions.php | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index e98af0acd2..7a17a99d75 100644 --- 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. diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 125b917caa..6396290f0e 100644 --- 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; } /** -- 2.20.1