[MediaWiki-commits] [Gerrit] Output something even if 0 campaigns migrated. - change (mediawiki...UploadWizard)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Output something even if 0 campaigns migrated.
......................................................................


Output something even if 0 campaigns migrated.

Method documentation

Add FIXME about missing return

Change-Id: Ia044d27e935adeb06709467c2e9e43ced5c62ab5
---
M maintenance/migrateCampaigns.php
1 file changed, 40 insertions(+), 7 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/migrateCampaigns.php b/maintenance/migrateCampaigns.php
index fb7ba77..bede175 100644
--- a/maintenance/migrateCampaigns.php
+++ b/maintenance/migrateCampaigns.php
@@ -26,7 +26,11 @@
  * @author Yuvi Panda <yuvipa...@gmail.com>
  */
 
-require_once __DIR__ . '/../../../maintenance/Maintenance.php';
+$IP = getenv( 'MW_INSTALL_PATH' );
+if ( $IP === false ) {
+       $IP = dirname( __FILE__ ) . '/../../..';
+}
+require_once "$IP/maintenance/Maintenance.php";
 
 /**
  * Maintenance script to migrate campaigns from older, database table
@@ -35,6 +39,10 @@
  * @ingroup Maintenance
  */
 class MigrateCampaigns extends Maintenance {
+
+       /**
+        * @var DatabaseBase
+        */
        private $dbr = null;
 
        public function __construct() {
@@ -88,6 +96,10 @@
                'defaultAlt'
        );
 
+       /**
+        * @param $id int|string
+        * @return array
+        */
        private function getConfigFromDB( $id ) {
                $config = array();
 
@@ -119,6 +131,10 @@
                return $mergedConfig;
        }
 
+       /**
+        * @param $string string
+        * @return array
+        */
        private function explodeStringToArray( $string ) {
                $parts = explode( '|', $string );
                $array = array();
@@ -133,6 +149,10 @@
                return $array;
        }
 
+       /**
+        * @param $array array
+        * @return array
+        */
        private function trimArray( $array ) {
                $newArray = array();
                foreach ( $array as $key => $value ) {
@@ -150,8 +170,13 @@
                return $newArray;
        }
 
-
-       /* Ensure that the default license, if set, is the first */
+       /**
+        * Ensure that the default license, if set, is the first
+        *
+        * @param $licenses array
+        * @param $default string
+        * @return array
+        */
        private function ensureDefaultLicense( $licenses, $default ) {
                if ( count( $licenses ) === 1 || ( $default === null || trim( 
$default ) === '' ) ) {
                        return $licenses;
@@ -160,8 +185,14 @@
                        array_splice( $licenses, array_search( $default, 
$licenses ), 1 );
                }
                array_unshift( $licenses, $default );
+               // FIXME: No return value
        }
 
+       /**
+        * @param $campaign
+        * @param $oldConfig array
+        * @return array
+        */
        private function getConfigForJSON( $campaign, $oldConfig ) {
                $config = array(
                        'enabled' => $campaign->campaign_enabled === '1',
@@ -223,7 +254,8 @@
                        'uw_campaigns',
                        '*'
                );
-               
+
+               $count = 0;
                foreach ( $campaigns as $campaign ) {
                        $oldConfig = $this->getConfigFromDB( 
$campaign->campaign_id );
                        $newConfig = $this->getConfigForJSON( $campaign, 
$oldConfig );
@@ -232,15 +264,16 @@
                        $page = Wikipage::factory( $title );
 
                        $content = new CampaignContent( json_encode( $newConfig 
) );
-                       $status = $page->doEditContent( 
+                       $page->doEditContent(
                                $content, 
                                "Migrating from old campaign tables",
                                0, false,
                                User::newFromName( $user )
                        );
-                       echo "Migrated " . $campaign->campaign_name . "\n";
+                       $count++;
+                       $this->output( "Migrated {$campaign->campaign_name}\n" 
);
                }
-
+               $this->output( "$count campaigns migrated.\n" );
        }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/74387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia044d27e935adeb06709467c2e9e43ced5c62ab5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits