Closed #65: Raw response data

baibaratsky · May 25, 2015 · 4486cc7 · 4486cc7
1 parent 9e1c5a5
commit 4486cc7
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 3 deletions.
diff --git a/Api/MegaStock/AddMerchant/Response.php b/Api/MegaStock/AddMerchant/Response.php
@@ -19,6 +19,8 @@ class Response extends AbstractResponse
      */
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->returnCode = (int)$responseObject->retval;
         $this->returnDescription = (string)$responseObject->retdescr;

diff --git a/Api/MegaStock/CheckMerchant/Response.php b/Api/MegaStock/CheckMerchant/Response.php
@@ -25,6 +25,8 @@ class Response extends AbstractResponse
      */
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->returnCode = (int)$responseObject->retval;
         $this->returnDescription = (string)$responseObject->retdescr;

diff --git a/Api/X/X11/Response.php b/Api/X/X11/Response.php
@@ -49,6 +49,8 @@ class Response extends AbstractResponse
      */
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->returnCode = (int)$responseObject['retval'];
         $this->returnDescription = (string)$responseObject['retdesc'];

diff --git a/Api/X/X14/Response.php b/Api/X/X14/Response.php
@@ -46,6 +46,8 @@ class Response extends AbstractResponse
 
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->requestNumber = (int)$responseObject->reqn;
         $this->returnCode = (int)$responseObject->retval;

diff --git a/Api/X/X17/ContractInfo/Response.php b/Api/X/X17/ContractInfo/Response.php
@@ -19,6 +19,8 @@ class Response extends AbstractResponse
      */
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->returnCode = (int)$responseObject->retval;
         $this->returnDescription = (string)$responseObject->retdesc;

diff --git a/Api/X/X17/CreateContract/Response.php b/Api/X/X17/CreateContract/Response.php
@@ -19,6 +19,8 @@ class Response extends AbstractResponse
      */
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->returnCode = (int)$responseObject->retval;
         $this->returnDescription = (string)$responseObject->retdesc;

diff --git a/Api/X/X18/Response.php b/Api/X/X18/Response.php
@@ -93,6 +93,8 @@ class Response extends AbstractResponse
      */
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->returnCode = (int)$responseObject->retval;
         $this->returnDescription = (string)$responseObject->retdesc;

diff --git a/Api/X/X19/Response.php b/Api/X/X19/Response.php
@@ -25,6 +25,8 @@ class Response extends AbstractResponse
      */
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->returnCode = (int)$responseObject->retval;
         $this->returnDescription = (string)$responseObject->retdesc;

diff --git a/Api/X/X2/Response.php b/Api/X/X2/Response.php
@@ -55,6 +55,8 @@ class Response extends AbstractResponse
      */
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->returnCode = (int)$responseObject->retval;
         $this->returnDescription = (string)$responseObject->retdesc;

diff --git a/Api/X/X3/Response.php b/Api/X/X3/Response.php
@@ -22,6 +22,8 @@ class Response extends AbstractResponse
      */
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->requestNumber = (int)$responseObject->reqn;
         $this->returnCode = (int)$responseObject->retval;

diff --git a/Api/X/X6/Response.php b/Api/X/X6/Response.php
@@ -19,6 +19,8 @@ class Response extends AbstractResponse
      */
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->returnCode = (int)$responseObject->retval;
         $this->returnDescription = (string)$responseObject->retdesc;

diff --git a/Api/X/X8/Response.php b/Api/X/X8/Response.php
@@ -22,6 +22,8 @@ class Response extends AbstractResponse
      */
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->returnCode = (int)$responseObject->retval;
         $this->returnDescription = (string)$responseObject->retdesc;

diff --git a/Api/X/X9/Response.php b/Api/X/X9/Response.php
@@ -19,6 +19,8 @@ class Response extends AbstractResponse
 
     public function __construct($response)
     {
+        parent::__construct($response);
+
         $responseObject = new \SimpleXMLElement($response);
         $this->requestNumber = (int)$responseObject->reqn;
         $this->returnCode = (int)$responseObject->retval;

diff --git a/README.md b/README.md
@@ -63,10 +63,14 @@ $request->setRequestedWmid('REQUESTED WMID');
 
 $request->sign(new Signer('YOUR WMID', 'FULL PATH TO KEY FILE', 'KEY FILE PASSWORD'));
 
+// You can access the request XML: $request->getData()
+
 if ($request->validate()) {
     /** @var WebMoney\Api\X\X9\Response $response */
     $response = $webMoney->request($request);
 
+    // The response from WebMoney is here: $response->getRawData()
+
     if ($response->getReturnCode() === 0) {
         echo $response->getPurseByName('Z000000000000')->getAmount();
     } else {

diff --git a/Request/AbstractResponse.php b/Request/AbstractResponse.php
@@ -4,19 +4,25 @@
 
 abstract class AbstractResponse
 {
-    /** @var \DateTimeZone */
-    private static $timeZone;
+    /** @var string Raw response data from WM */
+    protected $rawData;
 
     /** @var int retval */
     protected $returnCode;
 
     /** @var string retdesc */
     protected $returnDescription;
 
+    /** @var \DateTimeZone */
+    private static $timeZone;
+
     /**
      * @param string $response
      */
-    abstract public function __construct($response);
+    public function __construct($response)
+    {
+        $this->rawData = $response;
+    }
 
     /**
      * @return string Fully qualified name of the class
@@ -63,4 +69,12 @@ public function getReturnDescription()
     {
         return $this->returnDescription;
     }
+
+    /**
+     * @return string
+     */
+    public function getRawData()
+    {
+        return $this->rawData;
+    }
 }