Merge branch 'feature/merchant-meta-data' into php7

Author: Marco Dania

src/Callback/Result.php

@@ -87,6 +87,11 @@ class Result {
      */
     protected $extraData = array();
 
+    /**
+     * @var string
+     */
+    protected $merchantMetaData;
+
     /**
      * chargeback data (if transactionType = CHARGEBACK)
      *
@@ -148,6 +153,24 @@ public function addExtraData($key, $value) {
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getMerchantMetaData(): string
+    {
+        return $this->merchantMetaData;
+    }
+
+    /**
+     * @param string $merchantMetaData
+     * @return Result
+     */
+    public function setMerchantMetaData(string $merchantMetaData): Result
+    {
+        $this->merchantMetaData = $merchantMetaData;
+        return $this;
+    }
+
     /**
      * @return Error[]
      */

src/Transaction/Base/AbstractTransaction.php

@@ -42,6 +42,11 @@ class AbstractTransaction {
      */
     protected $extraData = array();
 
+    /**
+     * @var string
+     */
+    protected $merchantMetaData;
+
     /**
      * @var Request
      */
@@ -162,6 +167,24 @@ public function setExtraData($extraData) {
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getMerchantMetaData()
+    {
+        return $this->merchantMetaData;
+    }
+
+    /**
+     * @param string $merchantMetaData
+     * @return AbstractTransaction
+     */
+    public function setMerchantMetaData($merchantMetaData)
+    {
+        $this->merchantMetaData = $merchantMetaData;
+        return $this;
+    }
+
     /**
      * @param string $key
      * @param mixed  $value

src/Xml/Generator.php

@@ -165,6 +165,9 @@ protected function appendAbstractTransactionNodes(\DOMNode $parentNode, Abstract
         if ($transaction->getExtraData()) {
             $this->appendExtraDataNodes($parentNode, 'extraData', $transaction->getExtraData());
         }
+        if ($transaction->getMerchantMetaData()) {
+            $this->_appendTextNode($parentNode, 'merchantMetaData', $transaction->getMerchantMetaData());
+        }
 
         if ($transaction->getRequest()) {
             $this->appendRequestNode($parentNode, 'request', $transaction->getRequest());

src/Xml/Parser.php

@@ -126,6 +126,9 @@ public function parseCallback($xml) {
                     list($key, $value) = $this->parseExtraData($child);
                     $result->addExtraData($key, $value);
                     break;
+                case 'merchantMetaData':
+                    $result->setMerchantMetaData($child->nodeValue);
+                    break;
                 case 'chargebackData':
                     $chargebackData = $this->parseChargebackData($child);
                     $result->setChargebackData($chargebackData);