Merge pull request #4883 from totten/master-cs4

[civicrm-core.git] / CRM / Financial / BAO / PaymentProcessor.php

diff --git a/CRM/Financial/BAO/PaymentProcessor.php b/CRM/Financial/BAO/PaymentProcessor.php
index 1d33f68f3f640b7b4ed306cbe610fc8c79b31348..adb740cb33910371ee3bccc0a8a055a31e7ff740 100644 (file)
--- a/CRM/Financial/BAO/PaymentProcessor.php
+++ b/CRM/Financial/BAO/PaymentProcessor.php
@@ -36,8 +36,7 @@
 /**
  * This class contains payment processor related functions.
  */
-class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProcessor
-{
+class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProcessor {
   /**
    * Static holder for the default payment processor
    */
@@ -78,7 +77,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
         'entity_table' => 'civicrm_payment_processor',
         'entity_id' => $processor->id,
         'account_relationship' => $relationTypeId,
-        'financial_account_id' => $params['financial_account_id']
+        'financial_account_id' => $params['financial_account_id'],
       );
       CRM_Financial_BAO_FinancialTypeAccount::add($values);
     }
@@ -102,7 +101,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @param array $defaults
    *   (reference ) an assoc array to hold the flattened values.
    *
-     * @return CRM_Financial_DAO_PaymentProcessor object on success, null otherwise
+   * @return CRM_Financial_DAO_PaymentProcessor object on success, null otherwise
    * @static
    */
   public static function retrieve(&$params, &$defaults) {
@@ -192,7 +191,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
       CRM_Core_Error::fatal(ts('Invalid value passed to getPayment function'));
     }
 
-    $dao            = new CRM_Financial_DAO_PaymentProcessor( );
+    $dao            = new CRM_Financial_DAO_PaymentProcessor();
     $dao->id        = $paymentProcessorID;
     $dao->is_active = 1;
     if (!$dao->find(TRUE)) {
@@ -200,7 +199,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
     }
 
     if ($mode == 'test') {
-      $testDAO = new CRM_Financial_DAO_PaymentProcessor( );
+      $testDAO = new CRM_Financial_DAO_PaymentProcessor();
       $testDAO->name      = $dao->name;
       $testDAO->is_active = 1;
       $testDAO->is_test   = 1;
@@ -226,7 +225,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
       CRM_Core_Error::fatal(ts('Invalid value passed to getPayment function'));
     }
 
-    $payments = array( );
+    $payments = array();
     foreach ($paymentProcessorIDs as $paymentProcessorID) {
       $payment = self::getPayment($paymentProcessorID, $mode);
       $payments[$payment['id']] = $payment;
@@ -243,14 +242,14 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @param array_type $processor2
    * @return number
    */
-    public static function defaultComparison($processor1, $processor2){
-      $p1 = CRM_Utils_Array::value('is_default', $processor1);
-      $p2 = CRM_Utils_Array::value('is_default', $processor2);
-      if ($p1 == $p2) {
-        return 0;
-      }
-      return ($p1 > $p2) ? -1 : 1;
+  public static function defaultComparison($processor1, $processor2) {
+    $p1 = CRM_Utils_Array::value('is_default', $processor1);
+    $p2 = CRM_Utils_Array::value('is_default', $processor2);
+    if ($p1 == $p2) {
+      return 0;
     }
+    return ($p1 > $p2) ? -1 : 1;
+  }
 
   /**
    * Build payment processor details