explixitly set arg_separator for generateURI

We cannot rely on arg_separator.output to be set to it's default '&', therefore we explicitly set it here. Signed-off-by: Daniel Ziegenberg <[email protected]>
Spomky-Labs · Apr 14, 2024 · ab3a5f1 · ab3a5f1
1 parent 3380f38
commit ab3a5f1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/OTP.php b/src/OTP.php
@@ -98,7 +98,7 @@ protected function generateURI(string $type, array $options): string
         $this->hasColon($label) === false || throw new InvalidArgumentException('Label must not contain a colon.');
         $options = [...$options, ...$this->getParameters()];
         $this->filterOptions($options);
-        $params = str_replace(['+', '%7E'], ['%20', '~'], http_build_query($options));
+        $params = str_replace(['+', '%7E'], ['%20', '~'], http_build_query($options, arg_separator: '&'));
 
         return sprintf(
             'otpauth://%s/%s?%s',

diff --git a/tests/TOTPTest.php b/tests/TOTPTest.php
@@ -99,6 +99,19 @@ public function getProvisioningUri(): void
         );
     }
 
+    #[Test]
+    public function getProvisioningUriWithNonDefaultArgSeperator(): void
+    {
+        $otp = self::createTOTP(6, 'sha1', 30);
+
+        ini_set('arg_separator.output', '&amp;');
+
+        static::assertSame(
+            'otpauth://totp/My%20Project%3Aalice%40foo.bar?issuer=My%20Project&secret=JDDK4U6G3BJLEZ7Y',
+            $otp->getProvisioningUri()
+        );
+    }
+
     #[Test]
     #[DataProvider('dataRemainingTimeBeforeExpiration')]
     /**