Merge pull request #7 from alegraio/dev

Edited responses

Author: cansozeri

src/Messages/AbstractResponse.php

@@ -19,43 +19,51 @@ abstract class AbstractResponse extends \Omnipay\Common\Message\AbstractResponse
         'prod' => 'https://sanalposprov.garanti.com.tr/servlet/gt3dengine'
     ];
 
+    /**
+     * AbstractResponse constructor.
+     * @param RequestInterface $request
+     * @param $data
+     */
     public function __construct(RequestInterface $request, $data)
     {
         parent::__construct($request, $data);
         $this->setData($data);
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getMessage(): string
+    public function getMessage(): ?string
     {
+
         if (!$this->isSuccessful()) {
-            return $this->data["Transaction"]->Response->ErrorMsg . "->" . $this->data["Transaction"]->Response->SysErrMsg;
+            return (string)$this->data->Transaction->Response->ErrorMsg;
         }
 
-        return isset($this->data["Transaction"]) ? $this->data["Transaction"]->Response->Message : $this->data;
+        return (string)(!$this->getIsRedirect() ? $this->data->Transaction->Response->Message : null);
     }
 
+    /**
+     * @return string|null
+     */
     public function getCode(): ?string
     {
-        return (string)($this->data["Transaction"]->Response->Code ?? null);
+        return (string)($this->data->Transaction->Response->Code ?? null);
     }
 
     /**
-     * @param mixed $data
-     * @return array
+     * @param $data
      */
-    public function setData($data): array
+    public function setData($data): void
     {
         if (is_array($data)) {
             $content = $data;
             $this->setIsRedirect(true);
         } else {
-            $content = (array)simplexml_load_string($data);
+            $content = simplexml_load_string($data);
         }
 
-        return $this->data = $content;
+        $this->data = $content;
     }
 
     /**
@@ -82,7 +90,7 @@ public function isSuccessful(): bool
         if ($this->getIsRedirect()) {
             return true;
         } else {
-            return current($this->data["Transaction"]->Response->Code) === '00';
+            return (string)$this->data->Transaction->Response->Code === '00';
         }
     }
 }

tests/GatewayTest.php

@@ -31,17 +31,50 @@ public function setUp()
         $this->gateway->setPassword('123qweASD/');
     }
 
+
+    public function testCapture()
+    {
+        $this->options = [
+            'card' => $this->getCardInfo(),
+            'orderId' => '90082020_324109',
+            'amount' => "100",
+            'currency' => 'TRY',
+            'installment' => "",
+            'clientIp' => '10.241.19.2'
+        ];
+
+        /** @var CaptureResponse $response */
+        $response = $this->gateway->capture($this->options)->send();
+        $this->assertTrue($response->isSuccessful());
+    }
+
+    public function testAuthorize()
+    {
+        $this->options = [
+            'card' => $this->getCardInfo(),
+            'orderId' => '90082020_324109',
+            'amount' => "100",
+            'currency' => 'TRY',
+            'installment' => "",
+            'clientIp' => '10.241.19.2'
+        ];
+
+        /** @var AuthorizeResponse $response */
+        $response = $this->gateway->authorize($this->options)->send();
+        $this->assertTrue($response->isSuccessful());
+    }
+
     public function testPurchase()
     {
         $this->options = [
             'card' => $this->getCardInfo(),
-            'orderId' => '43282041_14102',
+            'orderId' => '89852041_14102',
             'amount' => "10",
             'currency' => 'TRY',
             'returnUrl' => "https://eticaret.garanti.com.tr/destek/postback.aspx",
             'cancelUrl' => "https://eticaret.garanti.com.tr/destek/postback.aspx",
             'installment' => "",
-            'paymentMethod' => '',
+            'paymentMethod' => '3d',
             'clientIp' => '10.241.19.2',
             'secureKey' => '12345678'
         ];
@@ -106,38 +139,6 @@ public function testRefund()
     }
 
 
-    public function testAuthorize()
-    {
-        $this->options = [
-            'card' => $this->getCardInfo(),
-            'orderId' => '10082020_324109',
-            'amount' => "100",
-            'currency' => 'TRY',
-            'installment' => "",
-            'clientIp' => '10.241.19.2'
-        ];
-
-        /** @var AuthorizeResponse $response */
-        $response = $this->gateway->authorize($this->options)->send();
-        $this->assertTrue($response->isSuccessful());
-    }
-
-    public function testCapture()
-    {
-        $this->options = [
-            'card' => $this->getCardInfo(),
-            'orderId' => '10082020_324109',
-            'amount' => "100",
-            'currency' => 'TRY',
-            'installment' => "",
-            'clientIp' => '10.241.19.2'
-        ];
-
-        /** @var CaptureResponse $response */
-        $response = $this->gateway->capture($this->options)->send();
-        $this->assertTrue($response->isSuccessful());
-    }
-
     /**
      * @return CreditCard
      */