From 22dca6484f802d5e431fc3046cd7cec7f59432eb Mon Sep 17 00:00:00 2001
From: Chad Horohoe <chadh@wikimedia.org>
Date: Tue, 29 Oct 2013 15:23:30 -0700
Subject: [PATCH] Rename wfIsHipHop() to wfIsHHVM()

The former is only really used to refer to the older hphp compiler.
Now all docs pretty much exclusively are referring to HHVM and
that's the project's name going forward.

While we're here, swap HPHP_VERSION for HHVM_VERSION. Either work,
but the latter is more correct.

Only affected extension (in Git or SVN) is GWToolset, fixing in
I3a490ef.

Change-Id: I81e4ce5d14e344e67045050261f91b3c0159f222
---
 includes/GlobalFunctions.php        | 6 +++---
 includes/Init.php                   | 2 +-
 includes/specials/SpecialUpload.php | 2 +-
 includes/upload/UploadBase.php      | 2 +-
 maintenance/eval.php                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 77c09e53c0..3a8d0777d4 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2450,12 +2450,12 @@ function wfIsWindows() {
 }
 
 /**
- * Check if we are running under HipHop
+ * Check if we are running under HHVM
  *
  * @return Bool
  */
-function wfIsHipHop() {
-	return defined( 'HPHP_VERSION' );
+function wfIsHHVM() {
+	return defined( 'HHVM_VERSION' );
 }
 
 /**
diff --git a/includes/Init.php b/includes/Init.php
index 64431f09a8..dd5e2d7a85 100644
--- a/includes/Init.php
+++ b/includes/Init.php
@@ -48,7 +48,7 @@ class MWInit {
 	 * @return bool
 	 */
 	static function isHipHop() {
-		return defined( 'HPHP_VERSION' );
+		return wfIsHHVM();
 	}
 
 	/**
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 09facf4f2e..b79aaa94fa 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -812,7 +812,7 @@ class UploadForm extends HTMLForm {
 		$this->mMaxUploadSize['file'] = UploadBase::getMaxUploadSize( 'file' );
 		# Limit to upload_max_filesize unless we are running under HipHop and
 		# that setting doesn't exist
-		if ( !wfIsHipHop() ) {
+		if ( !wfIsHHVM() ) {
 			$this->mMaxUploadSize['file'] = min( $this->mMaxUploadSize['file'],
 				wfShorthandToInteger( ini_get( 'upload_max_filesize' ) ),
 				wfShorthandToInteger( ini_get( 'post_max_size' ) )
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 2260241d6c..b162de2361 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -105,7 +105,7 @@ abstract class UploadBase {
 		}
 
 		# Check php's file_uploads setting
-		return wfIsHipHop() || wfIniGetBool( 'file_uploads' );
+		return wfIsHHVM() || wfIniGetBool( 'file_uploads' );
 	}
 
 	/**
diff --git a/maintenance/eval.php b/maintenance/eval.php
index abedc61a7d..e03763fe62 100644
--- a/maintenance/eval.php
+++ b/maintenance/eval.php
@@ -70,7 +70,7 @@ while ( ( $line = Maintenance::readconsole() ) !== false ) {
 		readline_write_history( $historyFile );
 	}
 	$val = eval( $line . ";" );
-	if ( wfIsHipHop() || is_null( $val ) ) {
+	if ( wfIsHHVM() || is_null( $val ) ) {
 		echo "\n";
 	} elseif ( is_string( $val ) || is_numeric( $val ) ) {
 		echo "$val\n";
-- 
2.20.1