Merge "Bump min supported HHVM version to 3.18.5"

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 30a174a..f8bca34 100644 (file)
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -167,8 +167,8 @@ changes to languages because of Phabricator reports.
   HtmlFormatter\HtmlFormatter class should be used instead.
 
 == Compatibility ==
-MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
-HHVM 3.6.5 or later.
+MediaWiki 1.31 requires PHP 5.5.9 or later. Although HHVM 3.18.5 or later is supported,
+it is generally advised to use PHP 5.5.9 or later for long term support.
 
 MySQL/MariaDB is the recommended DBMS. PostgreSQL or SQLite can also be used,
 but support for them is somewhat less mature. There is experimental support for

diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index 0a9bba8..da428dd 100644 (file)
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -85,8 +85,8 @@ class PHPVersionCheck {
                                'implementation' => 'HHVM',
                                'version' => defined( 'HHVM_VERSION' ) ? HHVM_VERSION : 'undefined',
                                'vendor' => 'Facebook',
-                               'upstreamSupported' => '3.6.5',
-                               'minSupported' => '3.6.5',
+                               'upstreamSupported' => '3.18.5',
+                               'minSupported' => '3.18.5',
                                'upgradeURL' => 'https://docs.hhvm.com/hhvm/installation/introduction',
                        );
                }