CRM-14399 one more call to getMembershipStatusByDate + update add function call to...

diff --git a/CRM/Member/BAO/MembershipStatus.php b/CRM/Member/BAO/MembershipStatus.php
index 81c0fd0b2ca5a0211424c7daf747874b72f0b371..430269605cb2abc729894c677870d1caf4a9524a 100644 (file)
--- a/CRM/Member/BAO/MembershipStatus.php
+++ b/CRM/Member/BAO/MembershipStatus.php
@@ -112,14 +112,14 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
    * function to add the membership types
    *
    * @param array $params reference array contains the values submitted by the form
-   * @param array $ids    reference array contains the id
+   * @param array $ids array contains the id - this param is deprecated
    *
    * @access public
    * @static
    *
    * @return object
    */
-  static function add(&$params, &$ids) {
+  static function add(&$params, $ids = array()) {
     $params['is_active'] = CRM_Utils_Array::value('is_active', $params, FALSE);
     $params['is_current_member'] = CRM_Utils_Array::value('is_current_member', $params, FALSE);
     $params['is_admin'] = CRM_Utils_Array::value('is_admin', $params, FALSE);
@@ -139,7 +139,7 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
     }
 
     //for add mode, copy label to name.
-    $statusId = CRM_Utils_Array::value('membershipStatus', $ids);
+    $statusId = CRM_Utils_Array::value('id', $params, CRM_Utils_Array::value('membershipStatus', $ids));
     if (!$statusId && !empty($params['label']) && empty($params['name'])) {
       $params['name'] = $params['label'];
     }

diff --git a/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php b/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php
index ac16654de9d91dba92d67af9fb5fa7532de437ab..f6fd37eb439d31e8a3881ed47ca1836ba8a5a5a5 100644 (file)
--- a/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php
+++ b/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php
@@ -44,14 +44,12 @@ class CRM_Member_BAO_MembershipStatusTest extends CiviUnitTestCase {
      *
      */
   function testAdd() {
-
-    $ids = array();
     $params = array(
       'name' => 'pending',
       'is_active' => 1,
     );
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params, $ids);
+    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
 
     $result = $this->assertDBNotNull('CRM_Member_BAO_MembershipStatus', $membershipStatus->id,
       'name', 'id',
@@ -62,13 +60,12 @@ class CRM_Member_BAO_MembershipStatusTest extends CiviUnitTestCase {
 
   function testRetrieve() {
 
-    $ids = array();
     $params = array(
       'name' => 'testStatus',
       'is_active' => 1,
     );
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params, $ids);
+    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
     $defaults         = array();
     $result           = CRM_Member_BAO_MembershipStatus::retrieve($params, $defaults);
     $this->assertEquals($result->name, 'testStatus', 'Verify membership status name.');
@@ -77,13 +74,12 @@ class CRM_Member_BAO_MembershipStatusTest extends CiviUnitTestCase {
 
   function testSetIsActive() {
 
-    $ids = array();
     $params = array(
       'name' => 'pending',
       'is_active' => 1,
     );
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params, $ids);
+    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
     $result = CRM_Member_BAO_MembershipStatus::setIsActive($membershipStatus->id, 0);
     $this->assertEquals($result, TRUE, 'Verify membership status record updation.');
 
@@ -95,25 +91,23 @@ class CRM_Member_BAO_MembershipStatusTest extends CiviUnitTestCase {
   }
 
   function testGetMembershipStatus() {
-    $ids = array();
     $params = array(
       'name' => 'pending',
       'is_active' => 1,
     );
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params, $ids);
+    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
     $result = CRM_Member_BAO_MembershipStatus::getMembershipStatus($membershipStatus->id);
     $this->assertEquals($result['name'], 'pending', 'Verify membership status name.');
   }
 
   function testDel() {
-    $ids = array();
     $params = array(
       'name' => 'testStatus',
       'is_active' => 1,
     );
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params, $ids);
+    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
     CRM_Member_BAO_MembershipStatus::del($membershipStatus->id);
     $defaults = array();
     $result = CRM_Member_BAO_MembershipStatus::retrieve($params, $defaults);
@@ -121,7 +115,6 @@ class CRM_Member_BAO_MembershipStatusTest extends CiviUnitTestCase {
   }
 
   function testGetMembershipStatusByDate() {
-    $ids = array();
     $params = array(
       'name' => 'Current',
       'is_active' => 1,
@@ -129,23 +122,21 @@ class CRM_Member_BAO_MembershipStatusTest extends CiviUnitTestCase {
       'end_event' => 'end_date',
     );
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params, $ids);
+    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
     $toDate = date('Ymd');
 
-    $result = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($toDate, $toDate, $toDate);
+    $result = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($toDate, $toDate, $toDate, NULL, $params);
     $this->assertEquals($result['name'], 'Current', 'Verify membership status record.');
   }
 
   function testgetMembershipStatusCurrent() {
-
-    $ids = array();
     $params = array(
       'name' => 'Current',
       'is_active' => 1,
       'is_current_member' => 1,
     );
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params, $ids);
+    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
     $result = CRM_Member_BAO_MembershipStatus::getMembershipStatusCurrent();
 
     $this->assertEquals(empty($result), FALSE, 'Verify membership status records is_current_member.');