[REF] Minor cleanup
authoreileen <emcnaughton@wikimedia.org>
Sun, 17 Jan 2021 21:30:35 +0000 (10:30 +1300)
committereileen <emcnaughton@wikimedia.org>
Sun, 17 Jan 2021 21:30:35 +0000 (10:30 +1300)
CRM/Member/Form/Membership.php

index 8184a7f0d775feba04850a46f720296fd6c7bcee..3d453a291395c16a2c3be2f21aa129e34845f3ec 100644 (file)
@@ -1939,13 +1939,10 @@ DESC limit 1");
    * @param array $params
    * @param int $contactID
    *
-   * @return int|null
+   * @return int
    */
-  protected function legacyProcessRecurringContribution(&$params, $contactID) {
+  protected function legacyProcessRecurringContribution(array $params, $contactID): int {
     $form = $this;
-    if (empty($params['is_recur'])) {
-      return NULL;
-    }
 
     $recurParams = ['contact_id' => $contactID];
     $recurParams['amount'] = $params['amount'] ?? NULL;
@@ -1978,12 +1975,7 @@ DESC limit 1");
 
     $campaignId = $params['campaign_id'] ?? $form->_values['campaign_id'] ?? NULL;
     $recurParams['campaign_id'] = $campaignId;
-    $recurring = CRM_Contribute_BAO_ContributionRecur::add($recurParams);
-    if (is_a($recurring, 'CRM_Core_Error')) {
-      throw new CRM_Core_Exception(CRM_Core_Error::getMessages($recurring));
-    }
-
-    return $recurring->id;
+    return CRM_Contribute_BAO_ContributionRecur::add($recurParams)->id;
   }
 
 }