Fix signature on BAO_Product::add to make ids optional

civicrm · Jul 20, 2018 · ff93a82 · ff93a82
1 parent a74efcf
commit ff93a82
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/CRM/Contribute/BAO/Product.php b/CRM/Contribute/BAO/Product.php
@@ -94,7 +94,7 @@ public static function setIsActive($id, $is_active) {
    *
    * @return CRM_Contribute_DAO_Product
    */
-  public static function add(&$params, $ids) {
+  public static function add(&$params, $ids = []) {
     $id = CRM_Utils_Array::value('id', $params, CRM_Utils_Array::value('premium', $ids));
     if (empty($id)) {
       $defaultParams = [

diff --git a/CRM/Contribute/Form/ManagePremiums.php b/CRM/Contribute/Form/ManagePremiums.php
@@ -287,15 +287,14 @@ public function postProcess() {
       $params[$field] = CRM_Utils_Rule::cleanMoney($params[$field]);
     }
 
-    $ids = array();
     if ($this->_action & CRM_Core_Action::UPDATE) {
-      $ids['premium'] = $this->_id;
+      $params['id'] = $this->_id;
     }
 
     $this->_processImages($params);
 
     // Save to database
-    $premium = CRM_Contribute_BAO_Product::add($params, $ids);
+    $premium = CRM_Contribute_BAO_Product::add($params);
 
     CRM_Core_Session::setStatus(
       ts("The Premium '%1' has been saved.", array(1 => $premium->name)),

diff --git a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
@@ -362,10 +362,6 @@ public function testsortName() {
   public function testAddPremium() {
     $contactId = $this->individualCreate();
 
-    $ids = array(
-      'premium' => NULL,
-    );
-
     $params = array(
       'name' => 'TEST Premium',
       'sku' => 111,
@@ -376,7 +372,7 @@ public function testAddPremium() {
       'min_contribution' => 100,
       'is_active' => 1,
     );
-    $premium = CRM_Contribute_BAO_Product::add($params, $ids);
+    $premium = CRM_Contribute_BAO_Product::add($params);
 
     $this->assertEquals('TEST Premium', $premium->name, 'Check for premium  name.');
 

diff --git a/tests/phpunit/CRM/Contribute/BAO/ProductTest.php b/tests/phpunit/CRM/Contribute/BAO/ProductTest.php
@@ -39,7 +39,6 @@ public function setUp() {
    * Check method add()
    */
   public function testAdd() {
-    $ids = array();
     $params = array(
       'name' => 'Test Product',
       'sku' => 'TP-10',
@@ -50,7 +49,7 @@ public function testAdd() {
       'is_active' => 1,
     );
 
-    $product = CRM_Contribute_BAO_Product::add($params, $ids);
+    $product = CRM_Contribute_BAO_Product::add($params);
 
     $result = $this->assertDBNotNull('CRM_Contribute_BAO_Product', $product->id,
       'sku', 'id',
@@ -64,7 +63,6 @@ public function testAdd() {
    * Check method retrieve( )
    */
   public function testRetrieve() {
-    $ids = array();
     $params = array(
       'name' => 'Test Product',
       'sku' => 'TP-10',
@@ -75,7 +73,7 @@ public function testRetrieve() {
       'is_active' => 1,
     );
 
-    $product = CRM_Contribute_BAO_Product::add($params, $ids);
+    $product = CRM_Contribute_BAO_Product::add($params);
     $params = array('id' => $product->id);
     $default = array();
     $result = CRM_Contribute_BAO_Product::retrieve($params, $default);
@@ -86,7 +84,6 @@ public function testRetrieve() {
    * Check method setIsActive( )
    */
   public function testSetIsActive() {
-    $ids = array();
     $params = array(
       'name' => 'Test Product',
       'sku' => 'TP-10',
@@ -97,7 +94,7 @@ public function testSetIsActive() {
       'is_active' => 1,
     );
 
-    $product = CRM_Contribute_BAO_Product::add($params, $ids);
+    $product = CRM_Contribute_BAO_Product::add($params);
     CRM_Contribute_BAO_Product::setIsActive($product->id, 0);
 
     $isActive = $this->assertDBNotNull('CRM_Contribute_BAO_Product', $product->id,
@@ -112,7 +109,6 @@ public function testSetIsActive() {
    * Check method del( )
    */
   public function testDel() {
-    $ids = array();
     $params = array(
       'name' => 'Test Product',
       'sku' => 'TP-10',
@@ -123,7 +119,7 @@ public function testDel() {
       'is_active' => 1,
     );
 
-    $product = CRM_Contribute_BAO_Product::add($params, $ids);
+    $product = CRM_Contribute_BAO_Product::add($params);
 
     CRM_Contribute_BAO_Product::del($product->id);