#v3.6.2005.0-rc - Fixed JsonMapper compatibility + Invoice properties…

… deprecation (#43)

- Fixed JsonMapper compatibility PHP 7.4
- Added XRP and BUSD to currency model
- Deprecation of PaymentTotals in Invoice model
- Added XRP and BUSD to Currency model

src/BitPaySDK/Client.php

@@ -44,9 +44,9 @@
  * Class Client
  * @package Bitpay
  * @author  Antonio Buedo
- * @version 3.5.2003
+ * @version 3.6.2005
  * See bitpay.com/api for more information.
- * date 25.03.2020
+ * date 02.05.2020
  */
 class Client
 {

src/BitPaySDK/Env.php

@@ -11,7 +11,7 @@ interface Env
     const TestUrl               = "https://test.bitpay.com/";
     const ProdUrl               = "https://bitpay.com/";
     const BitpayApiVersion      = "2.0.0";
-    const BitpayPluginInfo      = "BitPay_PHP_Client_v3.5.2003";
+    const BitpayPluginInfo      = "BitPay_PHP_Client_v3.6.2005";
     const BitpayApiFrame        = "custom";
     const BitpayApiFrameVersion = "1.0.0";
 }

src/BitPaySDK/Model/Currency.php

@@ -17,6 +17,8 @@ class Currency
     const USDC = "USDC";
     const GUSD = "GUSD";
     const PAX  = "PAX";
+    const XRP  = "XRP";
+    const BUSD = "BUSD";
 
     // FIAT
     const AED = "AED";

src/BitPaySDK/Model/Invoice/Invoice.php

@@ -64,9 +64,37 @@ class Invoice
     protected $_transactionCurrency;
     protected $_amountPaid;
     protected $_exchangeRates;
+
+    /**
+     * PaymentTotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     protected $_paymentTotals;
+
+    /**
+     * PaymentSubtotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     protected $_paymentSubtotals;
+
+    /**
+     * PaymentDisplayTotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     protected $_paymentDisplayTotals;
+
+    /**
+     * PaymentDisplaySubTotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     protected $_paymentDisplaySubTotals;
 
     /**
@@ -86,10 +114,10 @@ public function __construct(float $price = null, string $currency = null)
         $this->_shopper = new Shopper();
         $this->_refundInfo = new RefundInfo();
         $this->_paymentCodes = null;
-        $this->_paymentTotals = new PaymentTotal();
-        $this->_paymentSubtotals = new PaymentTotal();
-        $this->_paymentDisplayTotals = new PaymentTotal();
-        $this->_paymentDisplaySubTotals = new PaymentTotal();
+        $this->_paymentTotals = null;
+        $this->_paymentSubtotals = null;
+        $this->_paymentDisplayTotals = null;
+        $this->_paymentDisplaySubTotals = null;
     }
 
     // API fields
@@ -534,44 +562,92 @@ public function setExchangeRates($exchangeRates)
         $this->_exchangeRates = $exchangeRates;
     }
 
+    /**
+     * PaymentTotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     public function getPaymentTotals()
     {
         return $this->_paymentTotals;
     }
 
+    /**
+     * PaymentTotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     public function setPaymentTotals($paymentTotals)
     {
-        $this->_paymentTotals = $paymentTotals;
+        $this->_paymentTotals = null;
     }
 
+    /**
+     * PaymentSubtotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     public function getPaymentSubtotals()
     {
         return $this->_paymentSubtotals;
     }
 
+    /**
+     * PaymentSubtotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     public function setPaymentSubtotals($paymentSubtotals)
     {
-        $this->_paymentSubtotals = $paymentSubtotals;
+        $this->_paymentSubtotals = null;
     }
 
+    /**
+     * PaymentDisplaySubTotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     public function getPaymentDisplaySubTotals()
     {
         return $this->_paymentDisplaySubTotals;
     }
 
+    /**
+     * PaymentDisplaySubTotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     public function setPaymentDisplaySubTotals($paymentDisplaySubTotals)
     {
-        $this->_paymentDisplaySubTotals = $paymentDisplaySubTotals;
+        $this->_paymentDisplaySubTotals = null;
     }
 
+    /**
+     * PaymentDisplayTotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     public function getPaymentDisplayTotals()
     {
         return $this->_paymentDisplayTotals;
     }
 
+    /**
+     * PaymentDisplayTotals will be deprecated TODO on version 4.0
+     *
+     * @var array
+     * @deprecated
+     */
     public function setPaymentDisplayTotals($paymentDisplayTotals)
     {
-        $this->_paymentDisplayTotals = $paymentDisplayTotals;
+        $this->_paymentDisplayTotals = null;
     }
 
     public function toArray()
@@ -618,10 +694,10 @@ public function toArray()
             'transactionCurrency'            => $this->getTransactionCurrency(),
             'amountPaid'                     => $this->getAmountPaid(),
             'exchangeRates'                  => $this->getExchangeRates(),
-            'paymentTotals'                  => $this->getPaymentTotals()->toArray(),
-            'paymentSubtotals'               => $this->getPaymentSubtotals()->toArray(),
-            'paymentDisplayTotals'           => $this->getPaymentDisplaySubTotals()->toArray(),
-            'paymentDisplaySubTotals'        => $this->getPaymentDisplaySubTotals()->toArray(),
+            'paymentTotals'                  => [],
+            'paymentSubtotals'               => [],
+            'paymentDisplayTotals'           => [],
+            'paymentDisplaySubTotals'        => [],
         ];
 
         foreach ($elements as $key => $value) {

src/BitPaySDK/Model/Invoice/PaymentCodes.php

@@ -5,7 +5,7 @@
 
 
 /**
- * PaymentCode will be deprecated TODO on version 4.0
+ * PaymentCodes will be deprecated TODO on version 4.0
  *
  * @deprecated
  */

src/BitPaySDK/Model/Invoice/PaymentTotal.php

@@ -4,6 +4,11 @@
 namespace BitPaySDK\Model\Invoice;
 
 
+/**
+ * PaymentTotal will be deprecated TODO on version 4.0
+ *
+ * @deprecated
+ */
 class PaymentTotal
 {
     protected $_btc;