More clean up of oracle/mssql

[lhc/web/wiklou.git] / includes / installer / DatabaseInstaller.php

diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php
index 8590e37..8b94d97 100644 (file)
--- 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 ) {
@@ -445,8 +447,7 @@ abstract class DatabaseInstaller {
         * @return string
         */
        public function getReadableName() {
-               // Messages: config-type-mysql, config-type-postgres, config-type-sqlite,
-               // config-type-oracle
+               // Messages: config-type-mysql, config-type-postgres, config-type-sqlite
                return wfMessage( 'config-type-' . $this->getName() )->text();
        }