X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPHPVersionCheck.php;h=7c28b39c6e8f64036755c9c94eccf242122fca1e;hb=21551d2d15f2262695ad9d56d38ae0af7d942ad9;hp=a48d46016cb7a666f58d260c62c0f811505d10cf;hpb=77e3624caba072521fbc1826af2d47f9b29f4032;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php index a48d46016c..7c28b39c6e 100644 --- a/includes/PHPVersionCheck.php +++ b/includes/PHPVersionCheck.php @@ -1,5 +1,4 @@ 'mbstring', 'utf8_encode' => 'xml', @@ -54,7 +54,6 @@ class PHPVersionCheck { * - api.php * - mw-config/index.php * - cli - * @return $this */ function setEntryPoint( $entryPoint ) { $this->entryPoint = $entryPoint; @@ -102,8 +101,6 @@ class PHPVersionCheck { /** * Displays an error, if the installed php version does not meet the minimum requirement. - * - * @return $this */ function checkRequiredPHPVersion() { $phpInfo = $this->getPHPInfo(); @@ -118,13 +115,14 @@ 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"; - // phpcs:ignore Generic.Files.LineLength + // phpcs:disable Generic.Files.LineLength $longHtml = <<upgrading your copy of {$phpInfo['implementation']}. @@ -139,7 +137,7 @@ class PHPVersionCheck { See ourcompatibility page for details of which versions are compatible with prior versions of {$phpInfo['implementation']}. HTML; - // phpcs:enable + // phpcs:enable Generic.Files.LineLength $this->triggerError( "Supported {$phpInfo['implementation']} versions", $shortText, @@ -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' ) ) { @@ -164,14 +160,14 @@ HTML; . "https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries\n" . "for help on installing the required components."; - // phpcs:ignore Generic.Files.LineLength + // phpcs:disable Generic.Files.LineLength $longHtml = <<mediawiki.org for help on installing the required components. HTML; - // phpcs:enable + // phpcs:enable Generic.Files.LineLength $this->triggerError( 'External dependencies', $shortText, $longText, $longHtml ); } @@ -179,8 +175,6 @@ HTML; /** * Displays an error, if a PHP extension does not exist. - * - * @return $this */ function checkExtensionExistence() { $missingExtensions = array();