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 bf138c4..8d642e1 100644 (file)
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -77,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
@@ -108,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',
                 );
         }
@@ -258,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;
@@ -266,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;
                         }
@@ -279,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>