X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPHPVersionCheck.php;h=187ec7970c93d0abd811dd8d550787ac8cdf44f4;hb=5dc68aedf45a7b2de6d6c6e736f9014873aa8186;hp=a48d46016cb7a666f58d260c62c0f811505d10cf;hpb=07a791ffd1d80c6a8f2ca4dfdbc3f2002ac869fe;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index a48d46016c..187ec7970c 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -1,5 +1,4 @@
'mbstring',
- 'utf8_encode' => 'xml',
+ 'xml_parser_create' => 'xml',
'ctype_digit' => 'ctype',
'json_decode' => 'json',
'iconv' => 'iconv',
@@ -54,7 +54,6 @@ class PHPVersionCheck {
* - api.php
* - mw-config/index.php
* - cli
- * @return $this
*/
function setEntryPoint( $entryPoint ) {
$this->entryPoint = $entryPoint;
@@ -95,15 +94,13 @@ class PHPVersionCheck {
'version' => PHP_VERSION,
'vendor' => 'the PHP Group',
'upstreamSupported' => '5.6.0',
- 'minSupported' => '5.5.9',
+ 'minSupported' => '7.0.0',
'upgradeURL' => 'https://secure.php.net/downloads.php',
);
}
/**
* Displays an error, if the installed php version does not meet the minimum requirement.
- *
- * @return $this
*/
function checkRequiredPHPVersion() {
$phpInfo = $this->getPHPInfo();
@@ -118,13 +115,14 @@ class PHPVersionCheck {
. "{$otherInfo['minSupported']}, you are using {$phpInfo['implementation']} "
. "{$phpInfo['version']}.";
- $longText = "Error: You might be using an older {$phpInfo['implementation']} version. \n"
+ $longText = "Error: You might be using an older {$phpInfo['implementation']} version "
+ . "({$phpInfo['implementation']} {$phpInfo['version']}). \n"
. "MediaWiki $this->mwVersion needs {$phpInfo['implementation']}"
. " $minimumVersion or higher or {$otherInfo['implementation']} version "
. "{$otherInfo['minSupported']}.\n\nCheck if you have a"
- . " newer php executable with a different name, such as php5.\n\n";
+ . " newer php executable with a different name.\n\n";
- // phpcs:ignore Generic.Files.LineLength
+ // phpcs:disable Generic.Files.LineLength
$longHtml = <<upgrading your copy of
{$phpInfo['implementation']}.
@@ -136,10 +134,10 @@ class PHPVersionCheck {
If for some reason you are unable to upgrade your {$phpInfo['implementation']} version,
you will need to download an
older version of MediaWiki from our website.
- See ourcompatibility page
+ See our compatibility page
for details of which versions are compatible with prior versions of {$phpInfo['implementation']}.
HTML;
- // phpcs:enable
+ // phpcs:enable Generic.Files.LineLength
$this->triggerError(
"Supported {$phpInfo['implementation']} versions",
$shortText,
@@ -151,8 +149,6 @@ HTML;
/**
* Displays an error, if the vendor/autoload.php file could not be found.
- *
- * @return $this
*/
function checkVendorExistence() {
if ( !file_exists( dirname( __FILE__ ) . '/../vendor/autoload.php' ) ) {
@@ -164,14 +160,14 @@ HTML;
. "https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries\n"
. "for help on installing the required components.";
- // phpcs:ignore Generic.Files.LineLength
+ // phpcs:disable Generic.Files.LineLength
$longHtml = <<mediawiki.org
for help on installing the required components.
HTML;
- // phpcs:enable
+ // phpcs:enable Generic.Files.LineLength
$this->triggerError( 'External dependencies', $shortText, $longText, $longHtml );
}
@@ -179,8 +175,6 @@ HTML;
/**
* Displays an error, if a PHP extension does not exist.
- *
- * @return $this
*/
function checkExtensionExistence() {
$missingExtensions = array();