Merge "Add config for serving main Page from the domain root"

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

index 2d9216d..8d642e1 100644 (file)
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -31,8 +31,6 @@
   *
   * @note This class uses setter methods instead of a constructor so that
   * it can be compatible with PHP 4, PHP 5 and PHP 7 (without warnings).
- *
- * @class
   */
  class PHPVersionCheck {
         /* @var string The number of the MediaWiki version used. */
@@ -79,8 +77,8 @@ class PHPVersionCheck {
         /**
          * Return the version of the installed PHP implementation.
          *
-        * @param string $impl By default, the function returns the info of the currently installed PHP
-        *  implementation. Using this parameter the caller can decide, what version info will be
+        * @param string|false $impl By default, the function returns the info of the currently installed
+        *  PHP implementation. Using this parameter the caller can decide, what version info will be
          *  returned. Valid values: HHVM, PHP
          * @return array An array of information about the PHP implementation, containing:
          *  - 'version': The version of the PHP implementation (specific to the implementation, not
@@ -110,8 +108,8 @@ class PHPVersionCheck {
                         'implementation' => 'PHP',
                         'version' => PHP_VERSION,
                         'vendor' => 'the PHP Group',
-                       'upstreamSupported' => '5.6.0',
-                       'minSupported' => '7.0.13',
+                       'upstreamSupported' => '7.1.0',
+                       'minSupported' => '7.2.0',
                         'upgradeURL' => 'https://www.php.net/downloads.php',
                 );
         }
@@ -123,10 +121,7 @@ class PHPVersionCheck {
                 $phpInfo = $this->getPHPInfo();
                 $minimumVersion = $phpInfo['minSupported'];
                 $otherInfo = $this->getPHPInfo( $phpInfo['implementation'] === 'HHVM' ? 'PHP' : 'HHVM' );
-               if (
-                       !function_exists( 'version_compare' )
-                       || version_compare( $phpInfo['version'], $minimumVersion ) < 0
-               ) {
+               if ( version_compare( $phpInfo['version'], $minimumVersion ) < 0 ) {
                         $shortText = "MediaWiki $this->mwVersion requires at least {$phpInfo['implementation']}"
                                 . " version $minimumVersion or {$otherInfo['implementation']} version "
                                 . "{$otherInfo['minSupported']}, you are using {$phpInfo['implementation']} "
@@ -263,7 +258,7 @@ HTML;
         <head>
                 <meta charset="UTF-8" />
                 <title>MediaWiki {$this->mwVersion}</title>
-               <style media='screen'>
+               <style media="screen">
                         body {
                                 color: #000;
                                 background-color: #fff;
@@ -271,7 +266,7 @@ HTML;
                                 padding: 2em;
                                 text-align: center;
                         }
-                       p, img, h1, h2, ul  {
+                       p, img, h1, h2, ul {
                                 text-align: left;
                                 margin: 0.5em 0 1em;
                         }
@@ -284,9 +279,9 @@ HTML;
                 </style>
         </head>
         <body>
-               <img src="{$encLogo}" alt='The MediaWiki logo' />
+               <img src="{$encLogo}" alt="The MediaWiki logo" />
                 <h1>MediaWiki {$this->mwVersion} internal error</h1>
-               <div class='error'>
+               <div class="error">
                 <p>
                         {$shortHtml}
                 </p>