Allow non-integer id formats such as hex

Pim Elshoff · Pim Elshoff · commit 07629d319781 · 2018-02-27T11:39:11.000+01:00
diff --git a/src/model/response/PaymentCompletedResponse.php b/src/model/response/PaymentCompletedResponse.php
@@ -52,7 +52,6 @@ public function getStatus()
     public static function createInstance($orderID, $status, $signature, SigningKey $signingKey)
     {
         //Sanitize input
-        $orderID = preg_replace('/[^0-9]/', '', $orderID);
         $status = preg_replace('/[^A-Z_]/', '', $status);
         $signature = preg_replace('/[^0-9a-f]/', '', $signature);
 
@@ -72,4 +71,4 @@ public function getSignatureData()
     {
         return array($this->orderID, $this->status);
     }
-}
+}
diff --git a/test/model/response/PaymentCompletedResponseTest.php b/test/model/response/PaymentCompletedResponseTest.php
@@ -30,4 +30,13 @@ public function testThatIsValidReturnsTrueForUnderscoreInStatus() {
         $this->assertEquals('1', $paymentCompletedResponse->getOrderID());
         $this->assertEquals('IN_PROGRESS', $paymentCompletedResponse->getStatus());
     }
+
+    public function testIsValidReturnsTrueForNonIntegerIds()
+    {
+        $signingKey = new SigningKey('secret');
+        $paymentCompletedResponse = PaymentCompletedResponse::createInstance('866a13038dd88f851fa3556a3b7d2da515018a95', 'COMPLETED', 'f29bc3142089ba67f3ff62a9b4b94fd2c923f50adbd752430ae480f70727863de750aa05d2dbae1bd0adb0c380135cbac34062b121cb051fbf9193a6a1c016fe', $signingKey);
+        $this->assertNotFalse($paymentCompletedResponse);
+        $this->assertEquals('866a13038dd88f851fa3556a3b7d2da515018a95', $paymentCompletedResponse->getOrderID());
+        $this->assertEquals('COMPLETED', $paymentCompletedResponse->getStatus());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ public function getStatus()`
`52`	`52`	`public static function createInstance($orderID, $status, $signature, SigningKey $signingKey)`
`53`	`53`	`{`
`54`	`54`	`//Sanitize input`
`55`		`- $orderID = preg_replace('/[^0-9]/', '', $orderID);`
`56`	`55`	`$status = preg_replace('/[^A-Z_]/', '', $status);`
`57`	`56`	`$signature = preg_replace('/[^0-9a-f]/', '', $signature);`
`58`	`57`
`@@ -72,4 +71,4 @@ public function getSignatureData()`
`72`	`71`	`{`
`73`	`72`	`return array($this->orderID, $this->status);`
`74`	`73`	`}`
`75`		`-}`
	`74`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,13 @@ public function testThatIsValidReturnsTrueForUnderscoreInStatus() {`
`30`	`30`	`$this->assertEquals('1', $paymentCompletedResponse->getOrderID());`
`31`	`31`	`$this->assertEquals('IN_PROGRESS', $paymentCompletedResponse->getStatus());`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+ public function testIsValidReturnsTrueForNonIntegerIds()`
	`35`	`+ {`
	`36`	`+ $signingKey = new SigningKey('secret');`
	`37`	`+ $paymentCompletedResponse = PaymentCompletedResponse::createInstance('866a13038dd88f851fa3556a3b7d2da515018a95', 'COMPLETED', 'f29bc3142089ba67f3ff62a9b4b94fd2c923f50adbd752430ae480f70727863de750aa05d2dbae1bd0adb0c380135cbac34062b121cb051fbf9193a6a1c016fe', $signingKey);`
	`38`	`+ $this->assertNotFalse($paymentCompletedResponse);`
	`39`	`+ $this->assertEquals('866a13038dd88f851fa3556a3b7d2da515018a95', $paymentCompletedResponse->getOrderID());`
	`40`	`+ $this->assertEquals('COMPLETED', $paymentCompletedResponse->getStatus());`
	`41`	`+ }`
`33`	`42`	`}`