Merge pull request #4958 from pratikshad/code-cleanup-batch-19

[civicrm-core.git] / CRM / Core / Payment / GoogleIPN.php

diff --git a/CRM/Core/Payment/GoogleIPN.php b/CRM/Core/Payment/GoogleIPN.php
index 0326dda87b6d360806a0e2f0abe785979319f287..16c5d6633cf5e3eafb738dec24a35ddf4dd1b29b 100644 (file)
--- a/CRM/Core/Payment/GoogleIPN.php
+++ b/CRM/Core/Payment/GoogleIPN.php
@@ -45,7 +45,6 @@ class CRM_Core_Payment_GoogleIPN extends CRM_Core_Payment_BaseIPN {
    * pattern and cache the instance in this variable
    *
    * @var object
-   * @static
    */
   static private $_singleton = NULL;
 
@@ -304,7 +303,7 @@ class CRM_Core_Payment_GoogleIPN extends CRM_Core_Payment_BaseIPN {
       foreach (array(
                  'membership',
                  'related_contact',
-                 'onbehalf_dupe_alert'
+                 'onbehalf_dupe_alert',
                ) as $fld) {
         if (!is_numeric($ids[$fld])) {
           unset($ids[$fld]);
@@ -410,7 +409,6 @@ WHERE  contribution_recur_id = {$ids['contributionRecur']}
    * @param $paymentProcessor
    *
    * @return object
-   * @static
    */
   public static function &singleton($mode, $component, &$paymentProcessor) {
     if (self::$_singleton === NULL) {
@@ -453,7 +451,6 @@ WHERE  contribution_recur_id = {$ids['contributionRecur']}
    * @internal param \xml $xml_response response send by google in xml format
    * @return array
    *   context of this call (test, module, payment processor id)
-   * @static
    */
   public function getContext($privateData, $orderNo, $root, $response, $serial) {
     $contributionID = CRM_Utils_Array::value('contributionID', $privateData);
@@ -494,8 +491,7 @@ WHERE  contribution_recur_id = {$ids['contributionRecur']}
         $ids['event'] = $privateData['eventID'];
       }
       else {
-        list($ids['event'], $ids['participant']) =
-          explode(CRM_Core_DAO::VALUE_SEPARATOR, $contribution->trxn_id);
+        list($ids['event'], $ids['participant']) = explode(CRM_Core_DAO::VALUE_SEPARATOR, $contribution->trxn_id);
       }
     }
 
@@ -588,13 +584,12 @@ WHERE  contribution_recur_id = {$ids['contributionRecur']}
       case "merchant-calculation-callback":
         break;
 
-      case "new-order-notification": {
+      case "new-order-notification":
         $response->SendAck($serial, FALSE);
         $ipn->newOrderNotify($data[$root], $privateData, $module);
         break;
-      }
 
-      case "order-state-change-notification": {
+      case "order-state-change-notification":
         $response->SendAck($serial, FALSE);
         $new_financial_state = $data[$root]['new-financial-order-state']['VALUE'];
         $new_fulfillment_order = $data[$root]['new-fulfillment-order-state']['VALUE'];
@@ -618,9 +613,8 @@ WHERE  contribution_recur_id = {$ids['contributionRecur']}
             break;
         }
         break;
-      }
 
-      case "authorization-amount-notification": {
+      case "authorization-amount-notification":
         $response->SendAck($serial, FALSE);
         $new_financial_state = $data[$root]['order-summary']['financial-order-state']['VALUE'];
         $new_fulfillment_order = $data[$root]['order-summary']['fulfillment-order-state']['VALUE'];
@@ -647,7 +641,6 @@ WHERE  contribution_recur_id = {$ids['contributionRecur']}
             break;
         }
         break;
-      }
 
       case "charge-amount-notification":
       case "chargeback-amount-notification":