Revision of the code and new PHPUnit tests

Author: dercoder

composer.json

@@ -24,6 +24,7 @@
         }
     },
     "require": {
+        "ext-SimpleXML": "*",
         "omnipay/common": "~2.0"
     },
     "require-dev": {

src/Omnipay/Ukash/Gateway.php

@@ -131,6 +131,6 @@ public function completePurchase(array $parameters = array())
 
     public function fetchTransaction(array $parameters = array())
     {
-        return $this->createRequest('\Omnipay\Ukash\Message\FetchTransactionRequest', $parameters);
+        return $this->createRequest('\Omnipay\Ukash\Message\CompletePurchaseRequest', $parameters);
     }
 }

src/Omnipay/Ukash/Message/AbstractRequest.php

@@ -1,6 +1,9 @@
 <?php
 namespace Omnipay\Ukash\Message;
 
+use SimpleXMLElement;
+use Omnipay\Common\Exception\InvalidResponseException;
+
 /**
  * Ukash Abstract Request
  *
@@ -137,6 +140,20 @@ public function sendRequest($method, $action, $data = null)
         $httpRequest = $this->httpClient->createRequest($method, $this->getEndpoint().$action, null, $data);
         $httpResponse = $httpRequest->send();
 
-        return $httpResponse->getBody(true);
+        $xml = new SimpleXMLElement(htmlspecialchars_decode($httpResponse->getBody(true)), LIBXML_NONET);
+
+        if (isset($xml->UKashRPP)) {
+            throw new InvalidResponseException('Missing "UKashRPP" element in XML response');
+        }
+
+        if (!isset($xml->UKashRPP->SecurityToken)) {
+            throw new InvalidResponseException('Missing "UKashRPP/SecurityToken" element in XML response');
+        }
+
+        if ($xml->UKashRPP->SecurityToken != $this->getResponseSecurityToken()) {
+            throw new InvalidResponseException('Invalid SecurityToken in XML response');
+        }
+
+        return $xml->UKashRPP;
     }
 }

src/Omnipay/Ukash/Message/CompletePurchaseRequest.php

@@ -2,18 +2,73 @@
 namespace Omnipay\Ukash\Message;
 
 /**
- * Ukash Complete Purchase Request
+ * Ukash TransactionStatus Request
  *
- * Once the consumer has completed his transaction, the system will notify the merchant
- * by doing an HTTP POST to the notification URL.
- * The following values will be sent to the merchant, via HTTP POST.
+ * The merchant can verify the transaction status by making a HTTP POST Request to the Transaction status web method.
+ * The method will return a string value containing a URL encoded XML string. The XML tags returned are listed below.
  *
  * @author Alexander Fedra <[email protected]>
  * @copyright 2014 DerCoder
  * @license http://opensource.org/licenses/mit-license.php MIT
  * @version 1.0.0
  */
-class CompletePurchaseRequest extends FetchTransactionRequest
+class CompletePurchaseRequest extends AbstractRequest
 {
+    /**
+     * Get the Response Security Token
+     *
+     * 20-Character alphanumeric unique Request-Token provided by Ukash.
+     * The token is used to validate the merchant account.
+     *
+     * @return string response security token
+     */
+    public function getUtid()
+    {
+        return $this->getParameter('utId');
+    }
 
+    /**
+     * Set the Response Security Token
+     *
+     * 20-Character alphanumeric unique Response-Token provided by Ukash.
+     * The token is used to validate the merchant account.
+     *
+     * @param  string $value response security token
+     * @return self
+     */
+    public function setUtid($value)
+    {
+        return $this->setParameter('utId', $value);
+    }
+
+    /**
+     * Get the data for this request.
+     *
+     * @return array request data
+     */
+    public function getData()
+    {
+        $data = parent::getData();
+
+        $this->validate(
+            'utId'
+        );
+
+        $data['UTID'] = $this->getUtid();
+
+        return $data;
+    }
+
+    /**
+     * Send the request with specified data
+     *
+     * @param  mixed                    $data The data to send
+     * @return FetchTransactionResponse
+     */
+    public function sendData($data)
+    {
+        $response = $this->sendRequest('POST', 'RPPGateway/process.asmx/GetTransactionStatus', $data);
+
+        return new FetchTransactionResponse($this, $response);
+    }
 }

src/Omnipay/Ukash/Message/FetchTransactionRequest.php

@@ -207,6 +207,6 @@ public function sendData($data)
     {
         $response = $this->sendRequest('POST', 'RPPGateway/process.asmx/GetUniqueTransactionID', $data);
 
-        return new PurchaseResponse($this, $response);
+        return new Response($this, $response);
     }
 }