From 07629d3197811ec73276b45910a68eaf7a8f5b66 Mon Sep 17 00:00:00 2001 From: Pim Elshoff Date: Tue, 27 Feb 2018 11:39:11 +0100 Subject: [PATCH 1/3] Allow non-integer id formats such as hex --- src/model/response/PaymentCompletedResponse.php | 3 +-- test/model/response/PaymentCompletedResponseTest.php | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/model/response/PaymentCompletedResponse.php b/src/model/response/PaymentCompletedResponse.php index 8a1c375..6c21819 100644 --- 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); } -} \ No newline at end of file +} diff --git a/test/model/response/PaymentCompletedResponseTest.php b/test/model/response/PaymentCompletedResponseTest.php index 103fbca..3c95b82 100644 --- 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()); + } } From 1a0a48a6c41812960fff8eff37c7c0e1a902f4b0 Mon Sep 17 00:00:00 2001 From: Pim Elshoff Date: Tue, 27 Feb 2018 11:51:32 +0100 Subject: [PATCH 2/3] Adapt composer package name --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4ac7814..ca53b90 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "opensdks/omnikassa2-sdk", + "name": "procurios/omnikassa2-sdk", "description": "Rabobank OmniKassa SDK", "license": "proprietary", "minimum-stability": "dev", From c632fc3301ae6aa4bf6c352308c41f947ea13be4 Mon Sep 17 00:00:00 2001 From: Pim Elshoff Date: Tue, 27 Feb 2018 12:03:48 +0100 Subject: [PATCH 3/3] Revert "Adapt composer package name" This reverts commit 1a0a48a6c41812960fff8eff37c7c0e1a902f4b0. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ca53b90..4ac7814 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "procurios/omnikassa2-sdk", + "name": "opensdks/omnikassa2-sdk", "description": "Rabobank OmniKassa SDK", "license": "proprietary", "minimum-stability": "dev",