[UAS-SCOUT] Add paymentBrandID to BluemConfiguration and update constructor type hints

- Introduced a new property `paymentBrandID` in `BluemConfiguration` for better configuration management.
- Updated constructor type hints in `BluemRequest` and `PaymentStatusBluemRequest` to use `BluemConfiguration` explicitly.
- Enhanced error handling in `BluemResponse` and `BluemConfigurationValidator` for improved clarity.

This change aims to streamline the configuration process and enhance type safety across the Bluem integration.

Author: daanrijpkemacb

src/Bluem.php

@@ -209,8 +209,9 @@ public function CreateMandateID(string $order_id, string $customer_id): string
      * @throws DOMException
      * @throws Exception
      */
-    public function PerformRequest(BluemRequestInterface $transaction_request): ErrorBluemResponse|IBANNameCheckBluemResponse|IdentityStatusBluemResponse|IdentityTransactionBluemResponse|MandateStatusBluemResponse|MandateTransactionBluemResponse|PaymentStatusBluemResponse|PaymentTransactionBluemResponse
-    {
+    public function PerformRequest(
+        BluemRequestInterface $transaction_request
+    ): ErrorBluemResponse|IBANNameCheckBluemResponse|IdentityStatusBluemResponse|IdentityTransactionBluemResponse|MandateStatusBluemResponse|MandateTransactionBluemResponse|PaymentStatusBluemResponse|PaymentTransactionBluemResponse {
         $validator = new BluemXMLValidator();
         if (
             ! $validator->validate(

src/Helpers/BluemConfiguration.php

@@ -58,6 +58,8 @@ class BluemConfiguration
      */
     public bool $webhookDebug = false;
 
+    public ?string $paymentBrandID = '';
+
     /**
      * An object containing the configuration for the Bluem integration. Can be an array or object
      *
@@ -75,7 +77,9 @@ public function __construct(object|array $raw)
         $validated = $this->validator->validate($raw);
 
         if ($validated === false) {
-            throw new InvalidBluemConfigurationException('Bluem Configuration is not valid: ' . $this->errorsAsString());
+            throw new InvalidBluemConfigurationException(
+                'Bluem Configuration is not valid: ' . $this->errorsAsString()
+            );
         }
 
         $this->environment           = $validated->environment ?? self::TESTING_ENVIRONMENT;

src/Requests/BluemRequest.php

@@ -9,6 +9,7 @@
 
 namespace Bluem\BluemPHP\Requests;
 
+use Bluem\BluemPHP\Bluem;
 use Bluem\BluemPHP\Constants;
 use Bluem\BluemPHP\Exceptions\InvalidBluemRequestException;
 use Bluem\BluemPHP\Helpers\BluemConfiguration;
@@ -118,7 +119,7 @@ class BluemRequest implements BluemRequestInterface
      * @throws InvalidBluemRequestException
      */
     public function __construct(
-        $config,
+        BluemConfiguration $config,
         string $entranceCode = "",
         string $expectedReturn = ""
     ) {

src/Requests/PaymentStatusBluemRequest.php

@@ -10,6 +10,7 @@
 namespace Bluem\BluemPHP\Requests;
 
 use Bluem\BluemPHP\Contexts\PaymentsContext;
+use Bluem\BluemPHP\Helpers\BluemConfiguration;
 
 class PaymentStatusBluemRequest extends BluemRequest
 {
@@ -22,7 +23,7 @@ class PaymentStatusBluemRequest extends BluemRequest
     protected $xmlInterfaceName = "EPaymentInterface";
 
     public function __construct(
-        $config,
+        BluemConfiguration $config,
         $transactionID,
         $expected_return = "",
         $entranceCode = ""

src/Responses/BluemResponse.php

@@ -60,7 +60,9 @@ public function GetEntranceCode(): string
         $attrs = $this->{$this->getParentXmlElement()}->attributes();
 
         if (! $attrs || ! isset($attrs['entranceCode'])) {
-            throw new RuntimeException("An error occurred in reading the transaction response: no entrance code found.");
+            throw new RuntimeException(
+                "An error occurred in reading the transaction response: no entrance code found."
+            );
         }
 
         return $attrs['entranceCode'] . "";

src/Validators/BluemConfigurationValidator.php

@@ -11,6 +11,7 @@
 
 use Bluem\BluemPHP\Constants;
 use Exception;
+use RuntimeException;
 use Throwable;
 
 class BluemConfigurationValidator
@@ -136,7 +137,9 @@ private function _validateProduction_accessToken($config)
     private function _validateBrandID($config)
     {
         if (! isset($config->brandID)) {
-            throw new Exception("brandID not set; please add this to your configuration when instantiating the Bluem integration");
+            throw new RuntimeException(
+                "brandID not set; please add this to your configuration when instantiating the Bluem integration"
+            );
         }
 
         return $config;

src/Validators/WebhookSignatureValidation.php

@@ -73,19 +73,35 @@ private function getKeyFileName(): string
         $prefix = 'webhook_bluem_nl_';
 
         // 2025 certificate on production from July 18th, 8:30 CET time
-        if ($this->env === BLUEM_ENVIRONMENT_PRODUCTION && ( ( $current_date === "2025-07-18" && $current_time >= "08:30" ) || $current_date > "2025-07-18")) {
+        if (
+            $this->env === BLUEM_ENVIRONMENT_PRODUCTION && (
+            ( $current_date === "2025-07-18" && $current_time >= "08:30" )
+            || $current_date > "2025-07-18")
+        ) {
             $timestamp = '20250717';
         // 2025 certificate on testing & acceptance from July 17th, 8:30 CET time
         } elseif (
             ($this->env === BLUEM_ENVIRONMENT_TESTING || $this->env === BLUEM_ENVIRONMENT_ACCEPTANCE)
-            && (($current_date === "2024-07-17" && $current_time >= "06:30") || $current_date > "2024-07-17")
+            && (($current_date === "2024-07-17"
+                    && $current_time >= "06:30") || $current_date > "2024-07-17")
         ) {
             $timestamp = '20250717';
-        } elseif ((  $current_date === "2024-07-01" && $current_time >= "12:00" ) || $current_date > "2024-07-01") {
+        } elseif (
+            (  $current_date === "2024-07-01" && $current_time >= "12:00" )
+            || $current_date > "2024-07-01"
+        ) {
             $timestamp = '20240701';
-        } elseif ($this->env === BLUEM_ENVIRONMENT_TESTING && ( ( $current_date === "2023-06-28" && $current_time >= "08:00" ) || $current_date > "2023-06-28")) {
+        } elseif (
+            $this->env === BLUEM_ENVIRONMENT_TESTING
+            && ( ( $current_date === "2023-06-28" && $current_time >= "08:00" )
+                || $current_date > "2023-06-28")
+        ) {
             $timestamp = '202306140200-202407050159';
-        } elseif ($this->env === BLUEM_ENVIRONMENT_PRODUCTION && ( ( $current_date === "2023-07-04" && $current_time >= "08:00" ) || $current_date > "2023-07-04")) {
+        } elseif (
+            $this->env === BLUEM_ENVIRONMENT_PRODUCTION
+            && ( ( $current_date === "2023-07-04" && $current_time >= "08:00" )
+                || $current_date > "2023-07-04")
+        ) {
             $timestamp = '202306140200-202407050159';
         } else {
             $timestamp = '202206090200-202307110159';

tests/Unit/IbanResponseTest.php

@@ -12,7 +12,8 @@ public function testIbanResponseKnownResultExposesAllFields(): void
     {
         $xml = <<<'XML'
 <?xml version="1.0" encoding="UTF-8"?>
-<IBANCheckInterface createDateTime="2026-04-05T00:00:00Z" messageCount="1" mode="direct" senderID="S001" type="TransactionRequest" version="1.0">
+<IBANCheckInterface createDateTime="2026-04-05T00:00:00Z" 
+messageCount="1" mode="direct" senderID="S001" type="TransactionRequest" version="1.0">
     <IBANCheckTransactionResponse entranceCode="20260405095326910">
         <IBANCheckResult>
             <IBANResult>KNOWN</IBANResult>