Merge pull request #4960 from monishdeb/INFRA-32

[civicrm-core.git] / CRM / Contribute / BAO / Contribution / Utils.php

diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php
index 2d427e8fa81989ee0e6a1f90be302979b43be225..75bd26eb26ff3c8dc0e39b9af7e24ca34bd5bcdf 100644 (file)
--- a/CRM/Contribute/BAO/Contribution/Utils.php
+++ b/CRM/Contribute/BAO/Contribution/Utils.php
@@ -60,9 +60,8 @@ class CRM_Contribute_BAO_Contribution_Utils {
    * @return array
    *   associated array
    *
-   * @static
    */
-  static function processConfirm(
+  public static function processConfirm(
     &$form,
     &$paymentParams,
     &$premiumParams,
@@ -385,7 +384,6 @@ class CRM_Contribute_BAO_Contribution_Utils {
    * @return array
    *   associated array
    *
-   * @static
    */
   public static function contributionChartMonthly($param) {
     if ($param) {
@@ -426,7 +424,6 @@ INNER JOIN   civicrm_contact AS contact ON ( contact.id = contrib.contact_id )
    * @return array
    *   associated array
    *
-   * @static
    */
   public static function contributionChartYearly() {
     $config = CRM_Core_Config::singleton();
@@ -514,7 +511,7 @@ INNER JOIN   civicrm_contact contact ON ( contact.id = contrib.contact_id )
         1 => array(
           'email' => $params['email'],
           'location_type_id' => $billingLocTypeId,
-        )
+        ),
       );
     }
 
@@ -571,7 +568,7 @@ INNER JOIN   civicrm_contact contact ON ( contact.id = contrib.contact_id )
     if (!in_array($type, array(
       'paypal',
       'google',
-      'csv'
+      'csv',
     ))
     ) {
       // return the params as is
@@ -809,10 +806,10 @@ INNER JOIN   civicrm_contact contact ON ( contact.id = contrib.contact_id )
     // if this is a recurring contribution then process it first
     if ($params['trxn_type'] == 'subscrpayment') {
       // see if a recurring record already exists
-      $recurring = new CRM_Contribute_BAO_ContributionRecur;
+      $recurring = new CRM_Contribute_BAO_ContributionRecur();
       $recurring->processor_id = $params['processor_id'];
       if (!$recurring->find(TRUE)) {
-        $recurring = new CRM_Contribute_BAO_ContributionRecur;
+        $recurring = new CRM_Contribute_BAO_ContributionRecur();
         $recurring->invoice_id = $params['invoice_id'];
         $recurring->find(TRUE);
       }
@@ -905,7 +902,6 @@ LIMIT 1
    * @return array
    *   array of tax amount
    *
-   * @static
    */
   public static function calculateTaxAmount($amount, $taxRate) {
     $taxAmount = array();