Merge pull request #4635 from colemanw/comments

[civicrm-core.git] / CRM / Dedupe / Merger.php

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 7057ad3555aa76139b5a3a8a63e594c3b54178e7..4c273c795c258ea0a4842c95680808808979ef59 100644 (file)
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -291,7 +291,7 @@ WHERE
   }
 
   /**
-   * return payment related table.
+   * Return payment related table.
    */
   static function paymentTables() {
     static $tables;
@@ -303,7 +303,7 @@ WHERE
   }
 
   /**
-   * return payment update Query.
+   * Return payment update Query.
    */
   static function paymentSql($tableName, $mainContactId, $otherContactId) {
     $sqls = array();
@@ -349,9 +349,9 @@ INNER JOIN  civicrm_participant participant ON ( participant.id = payment.partic
   }
 
   /**
-   * @param $mainId
-   * @param $otherId
-   * @param $tableName
+   * @param int $mainId
+   * @param int $otherId
+   * @param string $tableName
    * @param array $tableOperations
    * @param string $mode
    *
@@ -537,7 +537,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
   }
 
   /**
-   * Function to batch merge a set of contacts based on rule-group and group.
+   * Batch merge a set of contacts based on rule-group and group.
    *
    * @param  int $rgid rule group id
    * @param  int $gid group id
@@ -545,13 +545,9 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
    *                              A 'safe' value skips the merge if there are any un-resolved conflicts.
    *                              Does a force merge otherwise.
    * @param  boolean $autoFlip wether to let api decide which contact to retain and which to delete.
-   *
-   *
    * @param bool $redirectForPerformance
    *
    * @return array|bool
-   * @internal param array $cacheParams prev-next-cache params based on which next pair of contacts are computed.
-   *                              Generally used with batch-merge.
    * @static
    * @access public
    */
@@ -583,7 +579,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
   }
 
   /**
-   * Function to merge given set of contacts. Performs core operation.
+   * Merge given set of contacts. Performs core operation.
    *
    * @param  array $dupePairs set of pair of contacts for whom merge is to be done.
    * @param  array $cacheParams prev-next-cache params based on which next pair of contacts are computed.
@@ -600,8 +596,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
    * @static
    * @access public
    */
-  static function merge($dupePairs = array(
-    ), $cacheParams = array(), $mode = 'safe',
+  static function merge($dupePairs = array(), $cacheParams = array(), $mode = 'safe',
     $autoFlip = TRUE, $redirectForPerformance = FALSE
   ) {
     $cacheKeyString = CRM_Utils_Array::value('cache_key_string', $cacheParams);