dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update git submodules
[lhc/web/wiklou.git]
/
includes
/
PHPVersionCheck.php
diff --git
a/includes/PHPVersionCheck.php
b/includes/PHPVersionCheck.php
index
46452d9
..
187ec79
100644
(file)
--- a/
includes/PHPVersionCheck.php
+++ b/
includes/PHPVersionCheck.php
@@
-30,7
+30,7
@@
class PHPVersionCheck {
var $mwVersion = '1.31';
var $functionsExtensionsMapping = array(
'mb_substr' => 'mbstring',
var $mwVersion = '1.31';
var $functionsExtensionsMapping = array(
'mb_substr' => 'mbstring',
- '
utf8_encod
e' => 'xml',
+ '
xml_parser_creat
e' => 'xml',
'ctype_digit' => 'ctype',
'json_decode' => 'json',
'iconv' => 'iconv',
'ctype_digit' => 'ctype',
'json_decode' => 'json',
'iconv' => 'iconv',
@@
-94,7
+94,7
@@
class PHPVersionCheck {
'version' => PHP_VERSION,
'vendor' => 'the PHP Group',
'upstreamSupported' => '5.6.0',
'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',
);
}
'upgradeURL' => 'https://secure.php.net/downloads.php',
);
}
@@
-115,11
+115,12
@@
class PHPVersionCheck {
. "{$otherInfo['minSupported']}, you are using {$phpInfo['implementation']} "
. "{$phpInfo['version']}.";
. "{$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"
. "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:disable Generic.Files.LineLength
$longHtml = <<<HTML
// phpcs:disable Generic.Files.LineLength
$longHtml = <<<HTML
@@
-133,7
+134,7
@@
class PHPVersionCheck {
If for some reason you are unable to upgrade your {$phpInfo['implementation']} version,
you will need to <a href="https://www.mediawiki.org/wiki/Download">download</a> an
older version of MediaWiki from our website.
If for some reason you are unable to upgrade your {$phpInfo['implementation']} version,
you will need to <a href="https://www.mediawiki.org/wiki/Download">download</a> an
older version of MediaWiki from our website.
- See our<a href="https://www.mediawiki.org/wiki/Compatibility#PHP">compatibility page</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 Generic.Files.LineLength
for details of which versions are compatible with prior versions of {$phpInfo['implementation']}.
HTML;
// phpcs:enable Generic.Files.LineLength