From 32f274992c25db0e691431540e9ef6c904bfac8f Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 20 Jul 2018 21:02:25 +1200
Subject: [PATCH] Remove ids from BAO_Product::create (renamed from add) 
 signature altogether

This is actually a new function so we don't need to respect the signature of the deprecated one
---
 CRM/Contribute/BAO/ManagePremiums.php                 | 8 ++++++--
 CRM/Contribute/BAO/Product.php                        | 8 +++-----
 CRM/Contribute/Form/ManagePremiums.php                | 2 +-
 tests/phpunit/CRM/Contribute/BAO/ContributionTest.php | 2 +-
 tests/phpunit/CRM/Contribute/BAO/ProductTest.php      | 8 ++++----
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/CRM/Contribute/BAO/ManagePremiums.php b/CRM/Contribute/BAO/ManagePremiums.php
index 35c93959cc..a7ba644ff7 100644
--- a/CRM/Contribute/BAO/ManagePremiums.php
+++ b/CRM/Contribute/BAO/ManagePremiums.php
@@ -85,8 +85,12 @@ class CRM_Contribute_BAO_ManagePremiums extends CRM_Contribute_BAO_Product {
    * @return CRM_Contribute_DAO_Product
    */
   public static function add(&$params, $ids) {
-    CRM_Core_Error::deprecatedFunctionWarning('CRM_Contribute_BAO_Product::add');
-    return parent::add($params, $ids);
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Contribute_BAO_Product::create');
+    $id = CRM_Utils_Array::value('id', $params, CRM_Utils_Array::value('premium', $ids));
+    if ($id) {
+      $params['id'] = $id;
+    }
+    return parent::create($params);
   }
 
   /**
diff --git a/CRM/Contribute/BAO/Product.php b/CRM/Contribute/BAO/Product.php
index 008e50e961..498e2fcb28 100644
--- a/CRM/Contribute/BAO/Product.php
+++ b/CRM/Contribute/BAO/Product.php
@@ -88,14 +88,12 @@ class CRM_Contribute_BAO_Product extends CRM_Contribute_DAO_Product {
    * Add a premium product to the database, and return it.
    *
    * @param array $params
-   *   Reference array contains the values submitted by the form.
-   * @param array $ids (deprecated)
-   *   Reference array contains the id.
+   *   Update parameters.
    *
    * @return CRM_Contribute_DAO_Product
    */
-  public static function add(&$params, $ids = []) {
-    $id = CRM_Utils_Array::value('id', $params, CRM_Utils_Array::value('premium', $ids));
+  public static function create($params) {
+    $id = CRM_Utils_Array::value('id', $params);
     if (empty($id)) {
       $defaultParams = [
         'id' => $id,
diff --git a/CRM/Contribute/Form/ManagePremiums.php b/CRM/Contribute/Form/ManagePremiums.php
index 6c0862bab4..c685ee0452 100644
--- a/CRM/Contribute/Form/ManagePremiums.php
+++ b/CRM/Contribute/Form/ManagePremiums.php
@@ -294,7 +294,7 @@ class CRM_Contribute_Form_ManagePremiums extends CRM_Contribute_Form {
     $this->_processImages($params);
 
     // Save to database
-    $premium = CRM_Contribute_BAO_Product::add($params);
+    $premium = CRM_Contribute_BAO_Product::create($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 f21a3d9927..83d94b0041 100644
--- a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
+++ b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
@@ -372,7 +372,7 @@ class CRM_Contribute_BAO_ContributionTest extends CiviUnitTestCase {
       'min_contribution' => 100,
       'is_active' => 1,
     );
-    $premium = CRM_Contribute_BAO_Product::add($params);
+    $premium = CRM_Contribute_BAO_Product::create($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 3b7e8eda2e..6779d29be9 100644
--- a/tests/phpunit/CRM/Contribute/BAO/ProductTest.php
+++ b/tests/phpunit/CRM/Contribute/BAO/ProductTest.php
@@ -49,7 +49,7 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
       'is_active' => 1,
     );
 
-    $product = CRM_Contribute_BAO_Product::add($params);
+    $product = CRM_Contribute_BAO_Product::create($params);
 
     $result = $this->assertDBNotNull('CRM_Contribute_BAO_Product', $product->id,
       'sku', 'id',
@@ -73,7 +73,7 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
       'is_active' => 1,
     );
 
-    $product = CRM_Contribute_BAO_Product::add($params);
+    $product = CRM_Contribute_BAO_Product::create($params);
     $params = array('id' => $product->id);
     $default = array();
     $result = CRM_Contribute_BAO_Product::retrieve($params, $default);
@@ -94,7 +94,7 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
       'is_active' => 1,
     );
 
-    $product = CRM_Contribute_BAO_Product::add($params);
+    $product = CRM_Contribute_BAO_Product::create($params);
     CRM_Contribute_BAO_Product::setIsActive($product->id, 0);
 
     $isActive = $this->assertDBNotNull('CRM_Contribute_BAO_Product', $product->id,
@@ -119,7 +119,7 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase {
       'is_active' => 1,
     );
 
-    $product = CRM_Contribute_BAO_Product::add($params);
+    $product = CRM_Contribute_BAO_Product::create($params);
 
     CRM_Contribute_BAO_Product::del($product->id);
 
-- 
2.25.1