X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=blobdiff_plain;f=includes%2Finstaller%2FDatabaseInstaller.php;h=ba5da6de50693ab217a6e1f4b00040b94d2cf746;hb=6162ec0f3551719420bba32fbac6e9b0e9a026fa;hp=8590e37ddf4cbf808601b9b1197e9a3ea7982a88;hpb=701b642fdc55de095e050cc56d65c61225473a06;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php index 8590e37ddf..ba5da6de50 100644 --- a/includes/installer/DatabaseInstaller.php +++ b/includes/installer/DatabaseInstaller.php @@ -20,6 +20,8 @@ * @file * @ingroup Deployment */ + +use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\LBFactorySingle; use Wikimedia\Rdbms\Database; use Wikimedia\Rdbms\IDatabase; @@ -49,7 +51,7 @@ abstract class DatabaseInstaller { /** * @var string Set by subclasses */ - protected static $notMinimumVerisonMessage; + protected static $notMinimumVersionMessage; /** * The database connection. @@ -82,7 +84,7 @@ abstract class DatabaseInstaller { public static function meetsMinimumRequirement( $serverVersion ) { if ( version_compare( $serverVersion, static::$minimumVersion ) < 0 ) { return Status::newFatal( - static::$notMinimumVerisonMessage, static::$minimumVersion, $serverVersion + static::$notMinimumVersionMessage, static::$minimumVersion, $serverVersion ); } @@ -359,8 +361,8 @@ abstract class DatabaseInstaller { throw new MWException( __METHOD__ . ': unexpected DB connection error' ); } - \MediaWiki\MediaWikiServices::resetGlobalInstance(); - $services = \MediaWiki\MediaWikiServices::getInstance(); + MediaWikiServices::resetGlobalInstance(); + $services = MediaWikiServices::getInstance(); $connection = $status->value; $services->redefineService( 'DBLoadBalancerFactory', function () use ( $connection ) {