Merge "Update formatting"

diff --git a/includes/db/Database.php b/includes/db/Database.php
index aa35aac..45a214e 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2691,8 +2691,8 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
         * @throws Exception
         * @return bool
         */
-       public function upsert(
-               $table, array $rows, array $uniqueIndexes, array $set, $fname = __METHOD__
+       public function upsert( $table, array $rows, array $uniqueIndexes, array $set,
+               $fname = __METHOD__
        ) {
                if ( !count( $rows ) ) {
                        return true; // nothing to do

diff --git a/includes/db/DatabaseMysqlBase.php b/includes/db/DatabaseMysqlBase.php
index 091896c..0c2e472 100644 (file)
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -940,8 +940,8 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
         * @param string $fname
         * @return bool
         */
-       public function upsert(
-               $table, array $rows, array $uniqueIndexes, array $set, $fname = __METHOD__
+       public function upsert( $table, array $rows, array $uniqueIndexes,
+               array $set, $fname = __METHOD__
        ) {
                if ( !count( $rows ) ) {
                        return true; // nothing to do