X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPHPVersionCheck.php;h=cbe63a33d4fff03d3c57260f9d0ee58ac90cc1a5;hb=95dc4cba413e41427f4afba8f70e8d422ed87442;hp=c49318bb1e1214ab0e995bfc8327841e6296d45c;hpb=1666a9d10bb007f715278d57b4c911196de19bab;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index c49318bb1e..cbe63a33d4 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -24,11 +24,20 @@
  * Check PHP Version, as well as for composer dependencies in entry points,
  * and display something vaguely comprehensible in the event of a totally
  * unrecoverable error.
+ *
+ * @note Since we can't rely on anything external, the minimum PHP versions
+ * and MW current version are hardcoded in this class.
+ *
+ * @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 */
-	var $mwVersion = '1.32';
+	/* @var string The number of the MediaWiki version used. */
+	var $mwVersion = '1.33';
+
+	/* @var array A mapping of PHP functions to PHP extensions. */
 	var $functionsExtensionsMapping = array(
 		'mb_substr'   => 'mbstring',
 		'xml_parser_create' => 'xml',
@@ -39,36 +48,42 @@ class PHPVersionCheck {
 	);
 
 	/**
-	 * @var string Which entry point we are protecting. One of:
-	 *   - index.php
-	 *   - load.php
-	 *   - api.php
-	 *   - mw-config/index.php
-	 *   - cli
+	 * @var string $format The format used for errors. One of "text" or "html"
+	 */
+	var $format = 'text';
+
+	/**
+	 * @var string $scriptPath
+	 */
+	var $scriptPath = '/';
+
+	/**
+	 * Set the format used for errors.
+	 *
+	 * @param string $format One of "text" or "html"
 	 */
-	var $entryPoint = null;
+	function setFormat( $format ) {
+		$this->format = $format;
+	}
 
 	/**
-	 * @param string $entryPoint Which entry point we are protecting. One of:
-	 *   - index.php
-	 *   - load.php
-	 *   - api.php
-	 *   - mw-config/index.php
-	 *   - cli
+	 * Set the script path used for images in HTML-formatted errors.
+	 *
+	 * @param string $scriptPath
 	 */
-	function setEntryPoint( $entryPoint ) {
-		$this->entryPoint = $entryPoint;
+	function setScriptPath( $scriptPath ) {
+		$this->scriptPath = $scriptPath;
 	}
 
 	/**
-	 * Returns the version of the installed php implementation.
+	 * 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
 	 *  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
-	 *  the version of the implemented php version)
+	 * @return array An array of information about the PHP implementation, containing:
+	 *  - 'version': The version of the PHP implementation (specific to the implementation, not
+	 *  the version of the implemented PHP version)
 	 *  - 'implementation': The name of the implementation used
 	 *  - 'vendor': The development group, vendor or developer of the implementation.
 	 *  - 'upstreamSupported': The minimum version of the implementation supported by the named vendor.
@@ -95,13 +110,13 @@ class PHPVersionCheck {
 			'version' => PHP_VERSION,
 			'vendor' => 'the PHP Group',
 			'upstreamSupported' => '5.6.0',
-			'minSupported' => '7.0.0',
+			'minSupported' => '7.0.13',
 			'upgradeURL' => 'https://secure.php.net/downloads.php',
 		);
 	}
 
 	/**
-	 * Displays an error, if the installed php version does not meet the minimum requirement.
+	 * Displays an error, if the installed PHP version does not meet the minimum requirement.
 	 */
 	function checkRequiredPHPVersion() {
 		$phpInfo = $this->getPHPInfo();
@@ -121,7 +136,7 @@ class PHPVersionCheck {
 				. "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.\n\n";
+				. " newer PHP executable with a different name.\n\n";
 
 			// phpcs:disable Generic.Files.LineLength
 			$longHtml = <<<HTML
@@ -234,14 +249,8 @@ HTML;
 	 * @return string
 	 */
 	function getIndexErrorOutput( $title, $longHtml, $shortText ) {
-		$pathinfo = pathinfo( $_SERVER['SCRIPT_NAME'] );
-		if ( $this->entryPoint == 'mw-config/index.php' ) {
-			$dirname = dirname( $pathinfo['dirname'] );
-		} else {
-			$dirname = $pathinfo['dirname'];
-		}
 		$encLogo =
-			htmlspecialchars( str_replace( '//', '/', $dirname . '/' ) .
+			htmlspecialchars( str_replace( '//', '/', $this->scriptPath . '/' ) .
 				'resources/assets/mediawiki.png' );
 		$shortHtml = htmlspecialchars( $shortText );
 
@@ -306,23 +315,13 @@ HTML;
 	 * @param string $longHtml
 	 */
 	function triggerError( $title, $shortText, $longText, $longHtml ) {
-		switch ( $this->entryPoint ) {
-			case 'cli':
-				$finalOutput = $longText;
-				break;
-			case 'index.php':
-			case 'mw-config/index.php':
-				$this->outputHTMLHeader();
-				$finalOutput = $this->getIndexErrorOutput( $title, $longHtml, $shortText );
-				break;
-			case 'load.php':
-				$this->outputHTMLHeader();
-				$finalOutput = "/* $shortText */";
-				break;
-			default:
-				$this->outputHTMLHeader();
-				// Handle everything that's not index.php
-				$finalOutput = $shortText;
+		if ( $this->format === 'html' ) {
+			// Used by index.php and mw-config/index.php
+			$this->outputHTMLHeader();
+			$finalOutput = $this->getIndexErrorOutput( $title, $longHtml, $shortText );
+		} else {
+			// Used by Maintenance.php (CLI)
+			$finalOutput = $longText;
 		}
 
 		echo "$finalOutput\n";
@@ -331,15 +330,16 @@ HTML;
 }
 
 /**
- * Check php version and that external dependencies are installed, and
+ * Check PHP version and that external dependencies are installed, and
  * display an informative error if either condition is not satisfied.
  *
- * @note Since we can't rely on anything, the minimum PHP versions and MW current
- * version are hardcoded here
+ * @param string $format One of "text" or "html"
+ * @param string $scriptPath Used when an error is formatted as HTML.
  */
-function wfEntryPointCheck( $entryPoint ) {
+function wfEntryPointCheck( $format = 'text', $scriptPath = '/' ) {
 	$phpVersionCheck = new PHPVersionCheck();
-	$phpVersionCheck->setEntryPoint( $entryPoint );
+	$phpVersionCheck->setFormat( $format );
+	$phpVersionCheck->setScriptPath( $scriptPath );
 	$phpVersionCheck->checkRequiredPHPVersion();
 	$phpVersionCheck->checkVendorExistence();
 	$phpVersionCheck->checkExtensionExistence();