Merge "Bump min supported HHVM version to 3.18.5"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 10 Jan 2018 12:37:30 +0000 (12:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 10 Jan 2018 12:37:30 +0000 (12:37 +0000)
1  2 
RELEASE-NOTES-1.31
includes/PHPVersionCheck.php

diff --combined 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
@@@ -1,5 -1,7 +1,5 @@@
  <?php
 -// @codingStandardsIgnoreFile Generic.Arrays.DisallowLongArraySyntax
 -// @codingStandardsIgnoreFile Generic.Files.LineLength
 -// @codingStandardsIgnoreFile MediaWiki.Usage.DirUsage.FunctionFound
 +// phpcs:ignoreFile Generic.Arrays.DisallowLongArraySyntax,MediaWiki.Usage.DirUsage.FunctionFound
  /**
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@@ -85,8 -87,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',
                        );
                }
                                . "{$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 = <<<HTML
                        Please consider <a href="{$phpInfo['upgradeURL']}">upgrading your copy of
                        {$phpInfo['implementation']}</a>.
                        See our<a href="https://www.mediawiki.org/wiki/Compatibility#PHP">compatibility page</a>
                        for details of which versions are compatible with prior versions of {$phpInfo['implementation']}.
  HTML;
 +                      // phpcs:enable
                        $this->triggerError(
                                "Supported {$phpInfo['implementation']} versions",
                                $shortText,
                                . "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 = <<<HTML
                MediaWiki now also has some external dependencies that need to be installed via
                composer or from a separate git repo. Please see
                <a href="https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries">mediawiki.org</a>
                for help on installing the required components.
  HTML;
 +                      // phpcs:enable
  
                        $this->triggerError( 'External dependencies', $shortText, $longText, $longHtml );
                }