Merge pull request #9 from comicrelief/getTransactionId-fix

Fix `getTransactionId()` so it really returns a string as advertised
comicrelief · Aug 23, 2017 · c530ede · c530ede
2 parents 3df5ab1 + 3f99b18
commit c530ede
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/Omnipay/WorldpayCGHosted/Message/ResponseTrait.php b/src/Omnipay/WorldpayCGHosted/Message/ResponseTrait.php
@@ -33,7 +33,7 @@ public function getTransactionId()
         $attributes = $this->getOrder()->attributes();
 
         if (isset($attributes['orderCode'])) {
-            return $attributes['orderCode'];
+            return (string) $attributes['orderCode'];
         }
 
         return null;

diff --git a/tests/Omnipay/WorldpayCGHosted/Message/NotificationTest.php b/tests/Omnipay/WorldpayCGHosted/Message/NotificationTest.php
@@ -24,6 +24,7 @@ public function testAuthorisedValid()
         $this->assertFalse($notification->isPending());
         $this->assertFalse($notification->isCancelled());
         $this->assertEquals('AUTHORISED', $notification->getStatus());
+        $this->assertInternalType('string', $notification->getTransactionId());
         $this->assertEquals('11001100-0000-0000-0000-000011110101', $notification->getTransactionId());
 
         $this->assertEquals('[OK]', $notification->getResponseBody());

diff --git a/tests/Omnipay/WorldpayCGHosted/Message/ResponseTest.php b/tests/Omnipay/WorldpayCGHosted/Message/ResponseTest.php
@@ -26,6 +26,7 @@ public function testPurchaseSuccessRedirect()
 
         $this->assertTrue($response->isRedirect());
         $this->assertFalse($response->isSuccessful());
+        $this->assertInternalType('string', $response->getTransactionId());
         $this->assertEquals('11001100-0000-0000-0000-000011110101', $response->getTransactionId());
         $this->assertEquals('PENDING', $response->getMessage());
     }