From: jenkins-bot Date: Wed, 10 Jan 2018 12:37:30 +0000 (+0000) Subject: Merge "Bump min supported HHVM version to 3.18.5" X-Git-Tag: 1.31.0-rc.0~951 X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=395b9c81ffcc11b6a564a26418dad990e1a708d5;hp=-c;p=lhc%2Fweb%2Fwiklou.git Merge "Bump min supported HHVM version to 3.18.5" --- 395b9c81ffcc11b6a564a26418dad990e1a708d5 diff --combined RELEASE-NOTES-1.31 index 30a174a8f8,c9dc2348fc..f8bca34e56 --- a/RELEASE-NOTES-1.31 +++ b/RELEASE-NOTES-1.31 @@@ -42,10 -42,6 +42,10 @@@ production ==== Upgraded external libraries ==== * Updated jquery.chosen from v0.9.14 to v1.8.2. +* Updated composer/spdx-licenses from 1.1.4 to + 1.2.0 (development dependency). +* Updated nikic/php-parser from 2.1.0 to 3.1.3 + (development dependency). * … ==== New external libraries ==== @@@ -163,12 -159,10 +163,12 @@@ changes to languages because of Phabric * The $statementsOnOwnLine parameter of JavaScriptMinifier::minify was removed. The corresponding configuration variable ($wgResourceLoaderMinifierStatementsOnOwnLine) has been deprecated since 1.27 and was removed as well. +* The HtmlFormatter class was removed (deprecated in 1.27). The namespaced + 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 --combined includes/PHPVersionCheck.php index 0a9bba8520,69bd24fd30..da428dde39 --- a/includes/PHPVersionCheck.php +++ b/includes/PHPVersionCheck.php @@@ -1,5 -1,7 +1,5 @@@ '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', ); } @@@ -124,7 -126,6 +124,7 @@@ . "{$otherInfo['minSupported']}.\n\nCheck if you have a" . " newer php executable with a different name, such as php5.\n\n"; + // phpcs:ignore Generic.Files.LineLength $longHtml = <<upgrading your copy of {$phpInfo['implementation']}. @@@ -139,7 -140,6 +139,7 @@@ See ourcompatibility page for details of which versions are compatible with prior versions of {$phpInfo['implementation']}. HTML; + // phpcs:enable $this->triggerError( "Supported {$phpInfo['implementation']} versions", $shortText, @@@ -164,14 -164,12 +164,14 @@@ . "https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries\n" . "for help on installing the required components."; + // phpcs:ignore Generic.Files.LineLength $longHtml = <<mediawiki.org for help on installing the required components. HTML; + // phpcs:enable $this->triggerError( 'External dependencies', $shortText, $longText, $longHtml ); }