Merge "Set defaultValue property on tz box in Special:Preferences to fix change check"

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

index 233ebf2..eaab9c8 100644 (file)
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -40,7 +40,9 @@ function wfEntryPointCheck( $entryPoint ) {
                 wfPHPVersionError( $entryPoint, $mwVersion, $minimumVersionPHP, $phpVersion );
         }
  
+       // @codingStandardsIgnoreStart MediaWiki.Usage.DirUsage.FunctionFound
         if ( !file_exists( dirname( __FILE__ ) . '/../vendor/autoload.php' ) ) {
+               // @codingStandardsIgnoreEnd
                 wfMissingVendorError( $entryPoint, $mwVersion );
         }
  }
@@ -160,7 +162,7 @@ function wfPHPVersionError( $type, $mwVersion, $minimumVersionPHP, $phpVersion )
  
         $longHtml = <<<HTML
                         Please consider <a href="http://www.php.net/downloads.php">upgrading your copy of PHP</a>.
-                       PHP versions less than 5.3.0 are no longer supported by the PHP Group and will not receive
+                       PHP versions less than 5.5.0 are no longer supported by the PHP Group and will not receive
                         security or bugfix updates.
                 </p>
                 <p>
@@ -180,7 +182,7 @@ HTML;
   * @param string $mwVersion See wfGenericError
   */
  function wfMissingVendorError( $type, $mwVersion ) {
-       $shortText = "Installing some external dependencies (e.g. via composer) is also required.";
+       $shortText = "Installing some external dependencies (e.g. via composer) is required.";
  
         $longText = "Error: You are missing some external dependencies. \n"
                 . "MediaWiki now also has some external dependencies that need to be installed\n"