Append url params properly if base already has query string params

Author: daanrijpkemacb

src/Requests/BluemRequest.php

@@ -445,4 +445,18 @@ public function setBrandId(string $brandID): void
     {
         $this->brandID = $brandID;
     }
+
+    /**
+     * Use the right separator based on the presence of a query string
+     */
+    protected function appendToUrl(string $urlBase, string $key, $value): string
+    {
+        $hasQueryString = preg_match('/\?.+=.+/', $urlBase);
+
+        if ($hasQueryString) {
+            return "{$urlBase}&{$key}={$value}";
+        }
+
+        return "{$urlBase}?{$key}={$value}";
+    }
 }

src/Requests/EmandateBluemRequest.php

@@ -67,7 +67,8 @@ public function __construct(BluemConfiguration $config, private $debtorReference
         $this->mandateID = $mandateID;
 
         // https - unique return URL for customer
-        $this->merchantReturnURL = sprintf('%s?mandateID=%s', $this->merchantReturnURLBase, $this->mandateID);
+        $this->merchantReturnURL = $this->appendToUrl($this->merchantReturnURLBase, 'mandateID',$this->mandateID);
+
         $this->sequenceType = $config->sequenceType ?? "RCUR";
         // reason for the mandate; configurable per client
         $this->eMandateReason = $config->eMandateReason ?? "Incasso machtiging";

src/Requests/IdentityBluemRequest.php

@@ -72,8 +72,7 @@ public function __construct(
         if (empty($debtorReturnURL)) {
             $debtorReturnURL = $config->merchantReturnURLBase;
         }
-
-        $this->debtorReturnURL = $debtorReturnURL . ('?debtorReference=' . $this->debtorReference);
+        $this->debtorReturnURL = $this->appendToUrl($debtorReturnURL,"debtorReference",$this->debtorReference);
 
         // @todo: make this a configurable setting
         $this->minAge = $config->minAge ?? BLUEM_DEFAULT_MIN_AGE;

src/Requests/PaymentBluemRequest.php

@@ -106,9 +106,8 @@ public function __construct(
             $this->debtorReturnURL = $config->merchantReturnURLBase;
         }
 
-        $this->debtorReturnURL .= sprintf('?entranceCode=%s&transactionID=%s', $this->entranceCode, $this->transactionID);
-
-        $this->debtorReturnURL = str_replace('&', '&', $this->debtorReturnURL);
+        $this->debtorReturnURL = $this->appendToUrl($this->debtorReturnURL, 'entranceCode', $this->entranceCode);
+        $this->debtorReturnURL = $this->appendToUrl($this->debtorReturnURL, 'transactionID',$this->transactionID);
 
         // Note: different variable name in config
         // added entranceCode as well, useful. Defined in generic bluem request class.
@@ -175,7 +174,7 @@ public function XmlString(): string
         if (!empty($this->brandID)) {
             $extraOptions['brandID'] = $this->brandID;
         }
-
+        
         return $this->XmlRequestInterfaceWrap(
             $this->xmlInterfaceName,
             'TransactionRequest',