Merge "Extend paragraph / line with block tag interaction tests"

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

diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 641f6e3..4e5ae8c 100644 (file)
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -60,7 +60,7 @@ class PostgresInstaller extends DatabaseInstaller {
                        $this->getTextBox( 'wgDBserver', 'config-db-host', array(), $this->parent->getHelpBox( 'config-db-host-help' ) ) .
                        $this->getTextBox( 'wgDBport', 'config-db-port' ) .
                        Html::openElement( 'fieldset' ) .
-                       Html::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) .
+                       Html::element( 'legend', array(), wfMessage( 'config-db-wiki-settings' )->text() ) .
                        $this->getTextBox( 'wgDBname', 'config-db-name', array(), $this->parent->getHelpBox( 'config-db-name-help' ) ) .
                        $this->getTextBox( 'wgDBmwschema', 'config-db-schema', array(), $this->parent->getHelpBox( 'config-db-schema-help' ) ) .
                        Html::closeElement( 'fieldset' ) .
@@ -125,9 +125,9 @@ class PostgresInstaller extends DatabaseInstaller {
 
        /**
         * Open a PG connection with given parameters
-        * @param $user string User name
-        * @param $password string Password
-        * @param $dbName string Database name
+        * @param string $user User name
+        * @param string $password Password
+        * @param string $dbName Database name
         * @return Status
         */
        protected function openConnectionWithParams( $user, $password, $dbName ) {
@@ -147,7 +147,7 @@ class PostgresInstaller extends DatabaseInstaller {
 
        /**
         * Get a special type of connection
-        * @param $type string See openPgConnection() for details.
+        * @param string $type See openPgConnection() for details.
         * @return Status
         */
        protected function getPgConnection( $type ) {
@@ -183,13 +183,14 @@ class PostgresInstaller extends DatabaseInstaller {
         * separate connection for this allows us to avoid accidental cross-module
         * dependencies.
         *
-        * @param $type string The type of connection to get:
+        * @param string $type The type of connection to get:
         *    - create-db:     A connection for creating DBs, suitable for pre-
         *                     installation.
         *    - create-schema: A connection to the new DB, for creating schemas and
         *                     other similar objects in the new DB.
         *    - create-tables: A connection with a role suitable for creating tables.
         *
+        * @throws MWException
         * @return Status object. On success, a connection object will be in the
         *   value member.
         */
@@ -382,9 +383,9 @@ class PostgresInstaller extends DatabaseInstaller {
        /**
         * Recursive helper for canCreateObjectsForWebUser().
         * @param $conn DatabaseBase object
-        * @param $targetMember int Role ID of the member to look for
-        * @param $group int Role ID of the group to look for
-        * @param $maxDepth int Maximum recursive search depth
+        * @param int $targetMember Role ID of the member to look for
+        * @param int $group Role ID of the group to look for
+        * @param int $maxDepth Maximum recursive search depth
         * @return bool
         */
        protected function isRoleMember( $conn, $targetMember, $group, $maxDepth ) {
@@ -530,8 +531,8 @@ class PostgresInstaller extends DatabaseInstaller {
                $schema = $this->getVar( 'wgDBmwschema' );
                return
 "# Postgres specific settings
-\$wgDBport           = \"{$port}\";
-\$wgDBmwschema       = \"{$schema}\";";
+\$wgDBport = \"{$port}\";
+\$wgDBmwschema = \"{$schema}\";";
        }
 
        public function preUpgrade() {