Insert space before compatibility link in PHP version message

[lhc/web/wiklou.git] / includes / PHPVersionCheck.php
diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php

index 77c725f..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',
-               '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,11 +115,12 @@ 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:disable Generic.Files.LineLength
                         $longHtml = <<<HTML
@@ -136,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.
-                       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
@@ -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' ) ) {
@@ -179,8 +175,6 @@ HTML;
  
         /**
          * Displays an error, if a PHP extension does not exist.
-        *
-        * @return $this
          */
         function checkExtensionExistence() {
                 $missingExtensions = array();