From ff93a82e461f4034a22d6381eb66f18f213f1599 Mon Sep 17 00:00:00 2001
From: Matthew Wire <devel@mrwire.co.uk>
Date: Fri, 20 Jul 2018 20:54:32 +1200
Subject: [PATCH] Fix signature on BAO_Product::add to make ids optional

---
 CRM/Contribute/BAO/Product.php                       |  2 +-
 CRM/Contribute/Form/ManagePremiums.php               |  5 ++---
 .../phpunit/CRM/Contribute/BAO/ContributionTest.php  |  6 +-----
 tests/phpunit/CRM/Contribute/BAO/ProductTest.php     | 12 ++++--------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/CRM/Contribute/BAO/Product.php b/CRM/Contribute/BAO/Product.php
index 05108e0d53..008e50e961 100644
--- a/CRM/Contribute/BAO/Product.php
+++ b/CRM/Contribute/BAO/Product.php
@@ -94,7 +94,7 @@ class CRM_Contribute_BAO_Product extends CRM_Contribute_DAO_Product {
    *
    * @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
index d860863d8d..6c0862bab4 100644
--- a/CRM/Contribute/Form/ManagePremiums.php
+++ b/CRM/Contribute/Form/ManagePremiums.php
@@ -287,15 +287,14 @@ class CRM_Contribute_Form_ManagePremiums extends CRM_Contribute_Form {
       $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
index 1175bc04dc..f21a3d9927 100644
--- a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
+++ b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
@@ -362,10 +362,6 @@ class CRM_Contribute_BAO_ContributionTest extends CiviUnitTestCase {
   public function testAddPremium() {
     $contactId = $this->individualCreate();
 
-    $ids = array(
-      'premium' => NULL,
-    );
-
     $params = array(
       'name' => 'TEST Premium',
       'sku' => 111,
@@ -376,7 +372,7 @@ class CRM_Contribute_BAO_ContributionTest extends CiviUnitTestCase {
       '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
index 22e5612f84..3b7e8eda2e 100644
--- a/tests/phpunit/CRM/Contribute/BAO/ProductTest.php
+++ b/tests/phpunit/CRM/Contribute/BAO/ProductTest.php
@@ -39,7 +39,6 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
    * Check method add()
    */
   public function testAdd() {
-    $ids = array();
     $params = array(
       'name' => 'Test Product',
       'sku' => 'TP-10',
@@ -50,7 +49,7 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
       '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 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
    * Check method retrieve( )
    */
   public function testRetrieve() {
-    $ids = array();
     $params = array(
       'name' => 'Test Product',
       'sku' => 'TP-10',
@@ -75,7 +73,7 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
       '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 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
    * Check method setIsActive( )
    */
   public function testSetIsActive() {
-    $ids = array();
     $params = array(
       'name' => 'Test Product',
       'sku' => 'TP-10',
@@ -97,7 +94,7 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
       '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 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
    * Check method del( )
    */
   public function testDel() {
-    $ids = array();
     $params = array(
       'name' => 'Test Product',
       'sku' => 'TP-10',
@@ -123,7 +119,7 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
       '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);
 
-- 
2.25.1