Merge pull request #16772 from eileenmcnaughton/mem_tax

Fix bug where tax_amount is miscalculated on membership renewals

diff --cc CRM/Member/Form.php
index dc8ca97f16d64ee37998c60f99260f9e2e658482,f1f0749e07f33a3184c4b1910cb8111e6e52ce52..a2e2ec3aa0a29ad1a01f2966dfe369db3c54845a
--- 1/CRM/Member/Form.php
--- 2/CRM/Member/Form.php
+++ b/CRM/Member/Form.php
@@@ -450,12 -450,12 +450,12 @@@ class CRM_Member_Form extends CRM_Contr
     * @return int
     */
    protected static function getPriceSetID($params) {
 -    $priceSetID = CRM_Utils_Array::value('price_set_id', $params);
 +    $priceSetID = $params['price_set_id'] ?? NULL;
      if (!$priceSetID) {
        $priceSetDetails = self::getPriceSetDetails($params);
-       return key($priceSetDetails);
+       return (int) key($priceSetDetails);
      }
-     return $priceSetID;
+     return (int) $priceSetID;
    }
  
    /**

diff --cc CRM/Member/Form/MembershipRenewal.php
Simple merge

diff --cc CRM/Price/BAO/PriceSet.php
Simple merge

diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge