[MediaWiki-commits] [Gerrit] Use __METHOD__ for DB begin/commit calls - change (mediawiki...CentralNotice)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/261729

Change subject: Use __METHOD__ for DB begin/commit calls
......................................................................

Use __METHOD__ for DB begin/commit calls

Change-Id: I50fc5ccbe15cb9c0b484f1138ad22481b9c1b271
---
M includes/Banner.php
M includes/Campaign.php
2 files changed, 14 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/29/261729/1

diff --git a/includes/Banner.php b/includes/Banner.php
index ef1da94..0d9d909 100644
--- a/includes/Banner.php
+++ b/includes/Banner.php
@@ -1072,12 +1072,12 @@
 
                        // Delete banner record from the CentralNotice 
cn_templates table
                        $dbw = CNDatabase::getDb();
-                       $dbw->begin();
+                       $dbw->begin( __METHOD__ );
                        $dbw->delete( 'cn_templates',
                                array( 'tmp_id' => $id ),
                                __METHOD__
                        );
-                       $dbw->commit();
+                       $dbw->commit( __METHOD__ );
 
                        // Delete the MediaWiki page that contains the banner 
source
                        $article = new Article(
diff --git a/includes/Campaign.php b/includes/Campaign.php
index 521cd56..3a30a22 100644
--- a/includes/Campaign.php
+++ b/includes/Campaign.php
@@ -836,7 +836,7 @@
                }
 
                $dbw = CNDatabase::getDb( DB_MASTER );
-               $dbw->begin();
+               $dbw->begin( __METHOD__ );
 
                $endTime = strtotime( '+1 hour', wfTimestamp( TS_UNIX, $startTs 
) );
                $endTs = wfTimestamp( TS_MW, $endTime );
@@ -880,7 +880,7 @@
                                        __METHOD__, array( 'IGNORE' ) );
                        }
 
-                       $dbw->commit();
+                       $dbw->commit( __METHOD__ );
 
                        // Log the creation of the campaign
                        $beginSettings = array();
@@ -939,13 +939,13 @@
                Campaign::logCampaignChange( 'removed', $campaignId, $user );
 
                $dbw = CNDatabase::getDb( DB_MASTER );
-               $dbw->begin();
+               $dbw->begin( __METHOD__ );
                $dbw->delete( 'cn_assignments', array( 'not_id' => $campaignId 
) );
                $dbw->delete( 'cn_notices', array( 'not_name' => $campaignName 
) );
                $dbw->delete( 'cn_notice_languages', array( 'nl_notice_id' => 
$campaignId ) );
                $dbw->delete( 'cn_notice_projects', array( 'np_notice_id' => 
$campaignId ) );
                $dbw->delete( 'cn_notice_countries', array( 'nc_notice_id' => 
$campaignId ) );
-               $dbw->commit();
+               $dbw->commit( __METHOD__ );
        }
 
        /**
@@ -973,7 +973,7 @@
                        return 'centralnotice-template-already-exists';
                }
 
-               $dbw->begin();
+               $dbw->begin( __METHOD__ );
                $noticeId = Campaign::getNoticeId( $eNoticeName );
                $dbw->insert( 'cn_assignments',
                        array(
@@ -983,7 +983,7 @@
                                'asn_bucket' => $bucket,
                        )
                );
-               $dbw->commit();
+               $dbw->commit( __METHOD__ );
 
                return true;
        }
@@ -993,11 +993,11 @@
         */
        static function removeTemplateFor( $noticeName, $templateName ) {
                $dbw = CNDatabase::getDb( DB_MASTER );
-               $dbw->begin();
+               $dbw->begin( __METHOD__ );
                $noticeId = Campaign::getNoticeId( $noticeName );
                $templateId = Banner::fromName( $templateName )->getId();
                $dbw->delete( 'cn_assignments', array( 'tmp_id' => $templateId, 
'not_id' => $noticeId ) );
-               $dbw->commit();
+               $dbw->commit( __METHOD__ );
        }
 
        /**
@@ -1223,7 +1223,7 @@
 
        static function updateProjects( $notice, $newProjects ) {
                $dbw = CNDatabase::getDb( DB_MASTER );
-               $dbw->begin();
+               $dbw->begin( __METHOD__ );
 
                // Get the previously assigned projects
                $oldProjects = Campaign::getNoticeProjects( $notice );
@@ -1247,12 +1247,12 @@
                        );
                }
 
-               $dbw->commit();
+               $dbw->commit( __METHOD__ );
        }
 
        static function updateProjectLanguages( $notice, $newLanguages ) {
                $dbw = CNDatabase::getDb( DB_MASTER );
-               $dbw->begin();
+               $dbw->begin( __METHOD__ );
 
                // Get the previously assigned languages
                $oldLanguages = Campaign::getNoticeLanguages( $notice );
@@ -1276,7 +1276,7 @@
                        );
                }
 
-               $dbw->commit();
+               $dbw->commit( __METHOD__ );
        }
 
        static function updateCountries( $notice, $newCountries ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50fc5ccbe15cb9c0b484f1138ad22481b9c1b271
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>

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