Fix symbols with leading zeroes, fixes #40 (#42)

RikudouSage · Nov 23, 2021 · 496b234 · 496b234
1 parent ad759f1
commit 496b234
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/QrPayment.php b/src/QrPayment.php
@@ -139,13 +139,13 @@ public function getQrString(): string
             $qrString .= sprintf('X-ID:%s*', $this->internalId);
         }
         if ($this->variableSymbol !== null) {
-            $qrString .= sprintf('X-VS:%d*', $this->variableSymbol);
+            $qrString .= sprintf('X-VS:%s*', $this->variableSymbol);
         }
         if ($this->specificSymbol !== null) {
-            $qrString .= sprintf('X-SS:%d*', $this->specificSymbol);
+            $qrString .= sprintf('X-SS:%s*', $this->specificSymbol);
         }
         if ($this->constantSymbol !== null) {
-            $qrString .= sprintf('X-KS:%d*', $this->constantSymbol);
+            $qrString .= sprintf('X-KS:%s*', $this->constantSymbol);
         }
         if ($this->payeeName !== null) {
             $qrString .= sprintf('RN:%s*', $this->payeeName);

diff --git a/tests/QrPaymentTest.php b/tests/QrPaymentTest.php
@@ -128,6 +128,10 @@ public function testVariableSymbol()
         self::assertEquals('789', $this->instance->getVariableSymbol());
         self::assertEquals("{$this->getDefaultEmptyString()}*X-VS:789", $this->instance->getQrString());
 
+        $this->instance->setVariableSymbol('001');
+        self::assertEquals('001', $this->instance->getVariableSymbol());
+        self::assertEquals("{$this->getDefaultEmptyString()}*X-VS:001", $this->instance->getQrString());
+
         $this->expectException(TypeError::class);
         $this->instance->setVariableSymbol([]);
     }
@@ -145,6 +149,10 @@ public function testSpecificSymbol()
         self::assertEquals('7890', $this->instance->getSpecificSymbol());
         self::assertEquals("{$this->getDefaultEmptyString()}*X-SS:7890", $this->instance->getQrString());
 
+        $this->instance->setSpecificSymbol('001');
+        self::assertEquals('001', $this->instance->getSpecificSymbol());
+        self::assertEquals("{$this->getDefaultEmptyString()}*X-SS:001", $this->instance->getQrString());
+
         $this->expectException(TypeError::class);
         $this->instance->setSpecificSymbol([]);
     }
@@ -162,6 +170,10 @@ public function testConstantSymbol()
         self::assertEquals('741', $this->instance->getConstantSymbol());
         self::assertEquals("{$this->getDefaultEmptyString()}*X-KS:741", $this->instance->getQrString());
 
+        $this->instance->setConstantSymbol('001');
+        self::assertEquals('001', $this->instance->getConstantSymbol());
+        self::assertEquals("{$this->getDefaultEmptyString()}*X-KS:001", $this->instance->getQrString());
+
         $this->expectException(TypeError::class);
         $this->instance->setConstantSymbol([]);
     }