Merge pull request #4809 from totten/master-cs2

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

diff --git a/CRM/Financial/BAO/PaymentProcessor.php b/CRM/Financial/BAO/PaymentProcessor.php
index 6032409d5ef9edb48b9b13c614342583754bdf67..3e0c66ab7608003c0f3a0cf5a7c5e0d8a761929d 100644 (file)
--- a/CRM/Financial/BAO/PaymentProcessor.php
+++ b/CRM/Financial/BAO/PaymentProcessor.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -51,7 +51,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @return CRM_Financial_DAO_PaymentProcessor
    * @throws Exception
    */
-  static function create($params) {
+  public static function create($params) {
     // FIXME Reconcile with CRM_Admin_Form_PaymentProcessor::updatePaymentProcessor
     $processor = new CRM_Financial_DAO_PaymentProcessor();
     $processor->copyValues($params);
@@ -87,7 +87,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
   /**
    * Class constructor
    */
-  function __construct() {
+  public function __construct() {
     parent::__construct();
   }
 
@@ -100,10 +100,9 @@ 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
-   * @access public
    * @static
    */
-  static function retrieve(&$params, &$defaults) {
+  public static function retrieve(&$params, &$defaults) {
     $paymentProcessor = new CRM_Financial_DAO_PaymentProcessor();
     $paymentProcessor->copyValues($params);
     if ($paymentProcessor->find(TRUE)) {
@@ -121,10 +120,9 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    *
    * @return Object             DAO object on sucess, null otherwise
    *
-   * @access public
    * @static
    */
-  static function setIsActive($id, $is_active) {
+  public static function setIsActive($id, $is_active) {
     return CRM_Core_DAO::setFieldValue('CRM_Financial_DAO_PaymentProcessor', $id, 'is_active', $is_active);
   }
 
@@ -136,9 +134,8 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @return object           The default payment processor object on success,
    *                          null otherwise
    * @static
-   * @access public
    */
-  static function &getDefault() {
+  public static function &getDefault() {
     if (self::$_defaultPaymentProcessor == NULL) {
       $params = array('is_default' => 1);
       $defaults = array();
@@ -153,10 +150,9 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @param int $paymentProcessorID
    *
    * @return null
-   * @access public
    * @static
    */
-  static function del($paymentProcessorID) {
+  public static function del($paymentProcessorID) {
     if (!$paymentProcessorID) {
       CRM_Core_Error::fatal(ts('Invalid value passed to delete function.'));
     }
@@ -183,9 +179,8 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    *
    * @return array  associated array with payment processor related fields
    * @static
-   * @access public
    */
-  static function getPayment($paymentProcessorID, $mode) {
+  public static function getPayment($paymentProcessorID, $mode) {
     if (!$paymentProcessorID) {
       CRM_Core_Error::fatal(ts('Invalid value passed to getPayment function'));
     }
@@ -219,7 +214,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @return array
    * @throws Exception
    */
-  static function getPayments($paymentProcessorIDs, $mode) {
+  public static function getPayments($paymentProcessorIDs, $mode) {
     if (!$paymentProcessorIDs) {
       CRM_Core_Error::fatal(ts('Invalid value passed to getPayment function'));
     }
@@ -241,7 +236,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @param array_type $processor2
    * @return number
    */
-    static function defaultComparison($processor1, $processor2){
+    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) {
@@ -258,9 +253,8 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    *
    * @return array  associated array with payment processor related fields
    * @static
-   * @access public
    */
-  static function buildPayment($dao, $mode) {
+  public static function buildPayment($dao, $mode) {
     $fields = array(
       'id', 'name', 'payment_processor_type_id', 'user_name', 'password',
       'signature', 'url_site', 'url_api', 'url_recur', 'url_button',
@@ -287,7 +281,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @throws CiviCRM_API3_Exception
    * @return array
    */
-  static function getAllPaymentProcessors($isExcludeTest, $reset = FALSE) {
+  public static function getAllPaymentProcessors($isExcludeTest, $reset = FALSE) {
     /**
      * $cacheKey = 'CRM_Financial_BAO_Payment_Processor_' . ($isExcludeTest ? 'test' : 'all');
     if (!$reset) {
@@ -324,7 +318,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    *
    * @return array available processors
    */
-  static function getPaymentProcessors($capabilities = array(), $isIncludeTest = FALSE, $ids = array()) {
+  public static function getPaymentProcessors($capabilities = array(), $isIncludeTest = FALSE, $ids = array()) {
     $processors = self::getAllPaymentProcessors(!$isIncludeTest);
     if ($capabilities) {
       foreach ($processors as $index => $processor) {
@@ -353,7 +347,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    *
    * @return bool
    */
-  static function hasPaymentProcessorSupporting($capabilities = array(), $isIncludeTest = FALSE) {
+  public static function hasPaymentProcessorSupporting($capabilities = array(), $isIncludeTest = FALSE) {
     $result = self::getPaymentProcessors($capabilities, $isIncludeTest);
     return (!empty($result)) ? TRUE : FALSE;
   }
@@ -367,9 +361,8 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    *
    * @return int / array / object based on type
    * @static
-   * @access public
    */
-  static function getProcessorForEntity($entityID, $component = 'contribute', $type = 'id') {
+  public static function getProcessorForEntity($entityID, $component = 'contribute', $type = 'id') {
     $result = NULL;
     if (!in_array($component, array(
       'membership', 'contribute', 'recur'))) {
@@ -429,4 +422,3 @@ INNER JOIN civicrm_contribution       con ON ( mp.contribution_id = con.id )
     return $result;
   }
 }
-