Merge "Skin: Make skins aware of their registered skin name"

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

diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 906768f..2265ae3 100644 (file)
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -21,6 +21,10 @@
  * @ingroup Deployment
  */
 
+use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\DBQueryError;
+use Wikimedia\Rdbms\DBConnectionError;
+
 /**
  * Class for setting up the MediaWiki database using Postgres.
  *
@@ -590,7 +594,7 @@ class PostgresInstaller extends DatabaseInstaller {
                        return $status;
                }
 
-               /** @var $conn DatabasePostgres */
+               /** @var DatabasePostgres $conn */
                $conn = $status->value;
 
                if ( $conn->tableExists( 'archive' ) ) {
@@ -633,7 +637,7 @@ class PostgresInstaller extends DatabaseInstaller {
 
        public function setupPLpgSQL() {
                // Connect as the install user, since it owns the database and so is
-               // the user that needs to run "CREATE LANGAUGE"
+               // the user that needs to run "CREATE LANGUAGE"
                $status = $this->getPgConnection( 'create-schema' );
                if ( !$status->isOK() ) {
                        return $status;