From: Max Semenik <maxsem.wiki@gmail.com>
Date: Fri, 13 Oct 2017 00:38:34 +0000 (-0700)
Subject: Remove old workaround for HHVM
X-Git-Tag: 1.31.0-rc.0~1780^2
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=edda8bbf8f6a7c37c0c2b8389d262e7afadf3bdc;p=lhc%2Fweb%2Fwiklou.git

Remove old workaround for HHVM

The bug in question was fixed in HHVM 3.6.0, our minimum requirement is 3.6.5.

Change-Id: Id1d65cf438c7148064d747f09728ef4cb5f51b52
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index ecbbb85117..4ad6e6e7d5 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1444,13 +1444,7 @@ abstract class Maintenance {
 		}
 
 		if ( $isatty && function_exists( 'readline' ) ) {
-			$resp = readline( $prompt );
-			if ( $resp === null ) {
-				// Workaround for https://github.com/facebook/hhvm/issues/4776
-				return false;
-			} else {
-				return $resp;
-			}
+			return readline( $prompt );
 		} else {
 			if ( $isatty ) {
 				$st = self::readlineEmulation( $prompt );