Update gateway response class.

Author: emr

src/Message/PurchaseRequest.php

@@ -112,9 +112,7 @@ public function sendData($data)
             $document->saveXML()
         );
 
-        $data = (array) simplexml_load_string($httpResponse->getBody());
-
-        return $this->response = new Response($this, $data);
+        return $this->response = new Response($this, $httpResponse);
     }
 
     public function getUserName()

src/Message/Response.php

@@ -7,6 +7,7 @@
 use Omnipay\Common\Message\AbstractResponse;
 use Omnipay\Common\Message\RedirectResponseInterface;
 use Omnipay\Common\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 
 /**
@@ -17,26 +18,26 @@
  */
 class Response extends AbstractResponse implements RedirectResponseInterface
 {
+    protected $statusCode;
+
     /**
      * construct
      *
-     * @param RequestInterface $request
-     * @param mixed            $data
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
      *
      * @throws InvalidResponseException
      */
-    public function __construct(RequestInterface $request, $data)
+    public function __construct(RequestInterface $request, ResponseInterface $response)
     {
         try {
-            if (is_string($data) || $data instanceof StreamInterface) {
-                $data = (array) simplexml_load_string((string) $data);
-            } elseif (!is_array($data)) {
-                throw new InvalidResponseException();
-            }
+            $data = (array) simplexml_load_string((string) $response->getBody());
         } catch (Exception $ex) {
             throw new InvalidResponseException();
         }
 
+        $this->statusCode = $response->getStatusCode();
+
         parent::__construct($request, $data);
     }
 
@@ -47,9 +48,7 @@ public function __construct(RequestInterface $request, $data)
      */
     public function getCode()
     {
-        return $this->isSuccessful()
-            ? (string) $this->data["Transaction"]->Response->ReasonCode
-            : parent::getCode(); //$this->data["Transaction"]->AuthCode
+        return $this->statusCode;
     }
 
     /**
@@ -59,7 +58,7 @@ public function getCode()
      */
     public function isSuccessful()
     {
-        return (string) $this->data["Transaction"]->Response->Code === '00';
+        return '00' === (string) $this->data["Transaction"]->Response->Code;
     }
 
     /**

tests/Message/PurchaseRequestTest.php

@@ -31,8 +31,8 @@ public function testGetData()
         /*
          * See https://bugs.php.net/bug.php?id=29500 for why this is cast to string
          */
-        $this->assertSame('11.00', (string) $data['Transaction']['Amount']);
         $this->assertSame('sales', (string) $data['Transaction']['Type']);
+        $this->assertSame('1100', (string) $data['Transaction']['Amount']);
         $this->assertSame('949', (string) $data['Transaction']['CurrencyCode']);
     }
 }

tests/Message/RefundRequestTest.php

@@ -38,7 +38,7 @@ public function testGetData()
          * See https://bugs.php.net/bug.php?id=29500 for why this is cast to string
          */
         $this->assertSame('refund', (string) $data['Transaction']['Type']);
-        $this->assertSame('11.00', (string) $data['Transaction']['Amount']);
+        $this->assertSame('1100', (string) $data['Transaction']['Amount']);
         $this->assertSame('949', (string) $data['Transaction']['CurrencyCode']);
     }
 }

tests/Message/ResponseTest.php

@@ -13,7 +13,7 @@ class ResponseTest extends TestCase
     public function testPurchaseSuccess()
     {
         $httpResponse = $this->getMockHttpResponse('PurchaseSuccess.txt');
-        $response = new Response($this->getMockRequest(), $httpResponse->getBody());
+        $response = new Response($this->getMockRequest(), $httpResponse);
 
         $this->assertTrue($response->isSuccessful());
         $this->assertEquals('xxx', $response->getTransactionReference());
@@ -24,7 +24,7 @@ public function testPurchaseSuccess()
     public function testPurchaseFailure()
     {
         $httpResponse = $this->getMockHttpResponse('PurchaseFailure.txt');
-        $response = new Response($this->getMockRequest(), $httpResponse->getBody());
+        $response = new Response($this->getMockRequest(), $httpResponse);
 
         $this->assertFalse($response->isSuccessful());
         $this->assertSame('', $response->getTransactionReference());
@@ -38,7 +38,7 @@ public function testPurchaseFailure()
     //        $request = m::mock('\Omnipay\Common\Message\AbstractRequest');
     //        $request->shouldReceive('getReturnUrl')->once()->andReturn('http://sanalmagaza.org/');
     //
-    //        $response = new Response($request, $httpResponse->getBody());
+    //        $response = new Response($request, $httpResponse);
     //
     //        $this->assertTrue($response->isRedirect());
     //        $this->assertSame('POST', $response->getRedirectMethod());