Merge pull request #4916 from totten/master-casetypetest-cleanup

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

diff --git a/CRM/Financial/BAO/PaymentProcessor.php b/CRM/Financial/BAO/PaymentProcessor.php
index d029da7106a8f66cb2a6f6fede7f6795f29db6be..eedcf0f643953c90a10a0802626d10b2255f741b 100644 (file)
--- a/CRM/Financial/BAO/PaymentProcessor.php
+++ b/CRM/Financial/BAO/PaymentProcessor.php
@@ -103,7 +103,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    *
    * @return CRM_Financial_DAO_PaymentProcessor|null
    *   object on success, null otherwise
-   * @static
    */
   public static function retrieve(&$params, &$defaults) {
     $paymentProcessor = new CRM_Financial_DAO_PaymentProcessor();
@@ -126,7 +125,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @return CRM_Financial_DAO_PaymentProcessor|null
    *   DAO object on success, null otherwise
    *
-   * @static
    */
   public static function setIsActive($id, $is_active) {
     return CRM_Core_DAO::setFieldValue('CRM_Financial_DAO_PaymentProcessor', $id, 'is_active', $is_active);
@@ -140,7 +138,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @return CRM_Financial_DAO_PaymentProcessor|null
    *   The default payment processor object on success,
    *   null otherwise
-   * @static
    */
   public static function &getDefault() {
     if (self::$_defaultPaymentProcessor == NULL) {
@@ -157,7 +154,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @param int $paymentProcessorID
    *
    * @return null
-   * @static
    */
   public static function del($paymentProcessorID) {
     if (!$paymentProcessorID) {
@@ -188,7 +184,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    *
    * @return array
    *   associated array with payment processor related fields
-   * @static
    */
   public static function getPayment($paymentProcessorID, $mode) {
     if (!$paymentProcessorID) {
@@ -265,7 +260,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    *
    * @return array
    *   associated array with payment processor related fields
-   * @static
    */
   public static function buildPayment($dao, $mode) {
     $fields = array(
@@ -309,15 +303,15 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    * @return array
    */
   public static function getAllPaymentProcessors($mode, $reset = FALSE) {
-    /**
+    /*
      * $cacheKey = 'CRM_Financial_BAO_Payment_Processor_' . ($mode ? 'test' : 'all');
      * if (!$reset) {
-     * $processors = CRM_Utils_Cache::singleton()->get($cacheKey);
-     * if (!empty($processors)) {
-     * return $processors;
-     * }
+     *   $processors = CRM_Utils_Cache::singleton()->get($cacheKey);
+     *   if (!empty($processors)) {
+     *     return $processors;
+     *   }
      * }
-     * */
+     */
     $retrievalParameters = array(
       'is_active' => TRUE,
       'options' => array('sort' => 'is_default DESC, name'),
@@ -418,7 +412,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
    *   Type of payment information to be retrieved.
    *
    * @return int|array|object
-   * @static
    */
   public static function getProcessorForEntity($entityID, $component = 'contribute', $type = 'id') {
     $result = NULL;