Merge pull request #127 from dmgctrlr/master

Fix issues related to xml2Array in query functions

See also issue #105 - the same problem on a different message. Perhaps this flags up refactoring needed to remove some duplicate code.

Author: judgej

src/Message/Query/AbstractQueryResponse.php

@@ -24,6 +24,8 @@ abstract class AbstractQueryResponse extends AbstractResponse
      */
     public function xml2array(\SimpleXMLElement $xml)
     {
+        return json_decode(json_encode($xml), true);
+
         $arr = array();
         foreach ($xml as $element) {
             $tag = $element->getName();

src/Message/Query/QueryBatchDetailResponse.php

@@ -39,7 +39,6 @@ public function isSuccessful()
 
     public function getData()
     {
-        $result = $this->xml2array($this->data->transactions, true);
-        return $result['transactions'][0]['transaction'];
+        return $this->xml2array($this->data->transactions, true)['transaction'];
     }
 }

src/Message/Query/QueryBatchResponse.php

@@ -51,7 +51,6 @@ public function getResultCode()
 
     public function getData()
     {
-        $result = $this->xml2array($this->data->batchList, true);
-        return $result['batchList'][0]['batch'];
+        return $this->xml2array($this->data->batchList, true)['batch'];
     }
 }

src/Message/Query/QueryDetailResponse.php

@@ -29,8 +29,7 @@ public function __construct(AbstractRequest $request, $data)
         }
 
         parent::__construct($request, $xml);
-        $result = $this->xml2array($this->data->transaction, true);
-        $this->transaction = $result['transaction'][0];
+        $this->transaction = $this->xml2array($this->data->transaction, true);
     }
 
     public function isSuccessful()

src/Message/Query/QueryResponse.php

@@ -37,7 +37,7 @@ public function getData()
                         'transactionReference' => $transaction['transId']
                     ))->send();
 
-                    $result[] = $detailResponse;
+                    $result[] = $detailResponse->transaction;
                 }
             }
         }