Merge "Move Modern and CologneBlue out of core"

[lhc/web/wiklou.git] / maintenance / convertUserOptions.php

diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php
index e2223e1..bf57244 100644 (file)
--- a/maintenance/convertUserOptions.php
+++ b/maintenance/convertUserOptions.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script to convert user options to the new `user_properties` table.
@@ -46,6 +46,7 @@ class ConvertUserOptions extends Maintenance {
 
                if ( !$dbw->fieldExists( 'user', 'user_options', __METHOD__ ) ) {
                        $this->output( "nothing to migrate. " );
+
                        return;
                }
                while ( $id !== null ) {
@@ -68,8 +69,8 @@ class ConvertUserOptions extends Maintenance {
        }
 
        /**
-        * @param $res
-        * @param $dbw DatabaseBase
+        * @param ResultWrapper $res
+        * @param DatabaseBase $dbw
         * @return null|int
         */
        function convertOptionBatch( $res, $dbw ) {
@@ -96,4 +97,4 @@ class ConvertUserOptions extends Maintenance {
 }
 
 $maintClass = "ConvertUserOptions";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;