Merge pull request #18 from comicrelief/GP-1243-notification-validation

GP-1243 - type check first so logs on 'empty' Notifications are more specific
comicrelief · Mar 15, 2018 · 99dab4f · 99dab4f
2 parents 05af6eb + 511881c
commit 99dab4f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Omnipay/WorldpayCGHosted/Message/Notification.php b/src/Omnipay/WorldpayCGHosted/Message/Notification.php
@@ -34,12 +34,12 @@ public function __construct($data, $notificationOriginIp)
     {
         $this->originIp = $notificationOriginIp;
 
-        if (empty($data)) {
-            throw new InvalidRequestException('Notification data empty');
+        if (!is_string($data)) {
+            throw new InvalidRequestException(sprintf('Notification data not a string - got %s', gettype($data)));
         }
 
-        if (!is_string($data)) {
-            throw new InvalidRequestException('Notification data not a string');
+        if ($data === '') {
+            throw new InvalidRequestException('Notification data empty');
         }
 
         $responseDom = new DOMDocument;
@@ -155,7 +155,7 @@ private function originIsValid()
             return false;
         }
 
-        $expectedEnd = 'worldpay.com';
+        $expectedEnd = 'worldpay.com'; // todo fix me
         $expectedPosition = strlen($hostname) - strlen($expectedEnd);
 
         if (strpos($hostname, $expectedEnd) === $expectedPosition) {