Null fields should not be part of signature [closes #60]

slevomat · Oct 24, 2022 · 7b8b281 · 7b8b281
1 parent 41702a3
commit 7b8b281
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Crypto/SignatureDataFormatter.php b/src/Crypto/SignatureDataFormatter.php
@@ -43,7 +43,7 @@ private function generateMessage(array $data, array $keys): array
 				}
 				continue;
 			}
-			if (!array_key_exists($key, $data)) {
+			if (!array_key_exists($key, $data) || $data[$key] === null) {
 				continue;
 			}
 

diff --git a/tests/unit/Crypto/SignatureDataFormatterTest.php b/tests/unit/Crypto/SignatureDataFormatterTest.php
@@ -152,6 +152,29 @@ public function getFormatDataForSignatureData(): array
 				],
 				'2017|0|2|1|CARD|VISA|MASTERCARD|PAN_ONLY',
 			],
+			[
+				[
+					'payId' => null,
+					'dttm' => null,
+					'resultCode' => null,
+					'resultMessage' => null,
+					'paymentStatus' => null,
+					'authCode' => null,
+					'statusDetail' => null,
+				],
+				[
+					'dttm' => '20221020125950',
+					'merchantId' => null,
+					'payId' => 'ea900d28f513@HJ',
+					'resultCode' => 0,
+					'resultMessage' => 'OK',
+					'paymentStatus' => 8,
+					'authCode' => null,
+					'statusDetail' => null,
+					'actions' => null,
+				],
+				'ea900d28f513@HJ|20221020125950|0|OK|8',
+			],
 		];
 	}