Merge branch 'master' of github.com:superbrave/omnipay-icepay-payments

Author: kiettran

src/Message/AbstractRequest.php

@@ -26,7 +26,7 @@ abstract class AbstractRequest extends OmnipayAbstractRequest
      */
     public function getData(): array
     {
-        $this->validate('contractProfileId', 'secretKey', 'timestamp'); // @todo add more keys to validate.
+        $this->validate('contractProfileId', 'secretKey', 'timestamp', 'currencyCode');
 
         return array();
     }

src/Message/RefundRequest.php

@@ -2,6 +2,7 @@
 
 namespace Omnipay\IcepayPayments\Message;
 
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Message\ResponseInterface;
 
 /**
@@ -27,9 +28,15 @@ public function getData(): array
 
     /**
      * {@inheritdoc}
+     *
+     * @throws InvalidRequestException When transaction reference is not set.
      */
     public function sendData($data): ResponseInterface
     {
+        if (empty($this->getTransactionReference())) {
+            throw new InvalidRequestException('Transaction reference missing for refund request.');
+        }
+
         $this->sendRequest(
             self::METHOD_POST,
             sprintf(

tests/Message/RefundRequestTest.php

@@ -3,6 +3,7 @@
 namespace Omnipay\IcepayPayments\Message;
 
 use GuzzleHttp\Psr7\Request;
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Http\Client;
 use Omnipay\IcepayPayments\AbstractTestCase;
 
@@ -34,7 +35,7 @@ protected function setUp(): void
     /**
      * Test a valid request for a refund.
      */
-    public function testRefundGetDataWithValidValues()
+    public function testRefundGetDataWithValidValues(): void
     {
         $expected = [
             'ContractProfileId' => '1-4M-4-B1G-B1G-G1RL',
@@ -54,7 +55,7 @@ public function testRefundGetDataWithValidValues()
     /**
      * Test actually sending the data to the client.
      */
-    public function testSendData()
+    public function testRefundSendDataWithValidRequest(): void
     {
         $this->request->setTransactionReference('1M-MR-M33533K5-L00K-47-M3');
         $response = $this->request->sendData($this->request->getData());
@@ -69,4 +70,15 @@ public function testSendData()
         $this->assertEquals($expectedRequest->getMethod(), $this->clientMock->getLastRequest()->getMethod());
         $this->assertEquals($expectedRequest->getUri(), $this->clientMock->getLastRequest()->getUri());
     }
+
+    /**
+     * Test actually sending the data to the client.
+     */
+    public function testRefundSendDataWithMissingReference(): void
+    {
+        $this->expectException(InvalidRequestException::class);
+
+        $this->request->setTransactionReference('');
+        $this->request->sendData($this->request->getData());
+    }
 }