[CC-1903] explicitly set nullable string parameter.

Ryouzanpaku · Ryouzanpaku · commit a4829d629dbd · 2025-07-08T16:31:41.000+02:00
diff --git a/src/Adapter/ApplepayAdapter.php b/src/Adapter/ApplepayAdapter.php
@@ -67,7 +67,7 @@ public function validMerchantValidationDomain(string $merchantValidationURL): bo
      *                             This is necessary if the ssl cert file doesn't contain key already.
      * @param string|null $caCert  Path to CA certificate.
      */
-    public function init(string $sslCert, string $sslKey = null, string $caCert = null): void
+    public function init(string $sslCert, ?string $sslKey = null, ?string $caCert = null): void
     {
         $timeout = EnvironmentService::getTimeout();
         $curlVerbose = EnvironmentService::isCurlVerbose();
diff --git a/src/Adapter/CurlAdapter.php b/src/Adapter/CurlAdapter.php
@@ -10,11 +10,10 @@
 
 namespace UnzerSDK\Adapter;
 
-use UnzerSDK\Unzer;
-use UnzerSDK\Services\EnvironmentService;
-use UnzerSDK\Exceptions\UnzerApiException;
 use RuntimeException;
-
+use UnzerSDK\Exceptions\UnzerApiException;
+use UnzerSDK\Services\EnvironmentService;
+use UnzerSDK\Unzer;
 use function extension_loaded;
 use function in_array;
 
@@ -37,7 +36,7 @@ public function __construct()
     /**
      * {@inheritDoc}
      */
-    public function init(string $url, string $payload = null, string $httpMethod = HttpAdapterInterface::REQUEST_GET): void
+    public function init(string $url, ?string $payload = null, string $httpMethod = HttpAdapterInterface::REQUEST_GET): void
     {
         $timeout = EnvironmentService::getTimeout();
         $curlVerbose = EnvironmentService::isCurlVerbose();
diff --git a/src/Adapter/HttpAdapterInterface.php b/src/Adapter/HttpAdapterInterface.php
@@ -25,7 +25,7 @@ interface HttpAdapterInterface
      * @param string|null $payload    Json encoded payload string.
      * @param string      $httpMethod The Http method to perform.
      */
-    public function init(string $url, string $payload = null, string $httpMethod = HttpAdapterInterface::REQUEST_GET): void;
+    public function init(string $url, ?string $payload = null, string $httpMethod = HttpAdapterInterface::REQUEST_GET): void;
 
     /**
      * Executes the request and returns the response.
diff --git a/src/Exceptions/UnzerApiException.php b/src/Exceptions/UnzerApiException.php
@@ -29,7 +29,7 @@ class UnzerApiException extends Exception
      * @param string      $code
      * @param string|null $errorId
      */
-    public function __construct($merchantMessage = '', $clientMessage = '', $code = null, string $errorId = null)
+    public function __construct($merchantMessage = '', $clientMessage = '', $code = null, ?string $errorId = null)
     {
         $merchantMessage = empty($merchantMessage) ? static::MESSAGE : $merchantMessage;
         $this->clientMessage = empty($clientMessage) ? static::CLIENT_MESSAGE : $clientMessage;
diff --git a/src/Interfaces/CancelServiceInterface.php b/src/Interfaces/CancelServiceInterface.php
@@ -8,13 +8,13 @@
 
 namespace UnzerSDK\Interfaces;
 
+use RuntimeException;
 use UnzerSDK\Constants\CancelReasonCodes;
 use UnzerSDK\Exceptions\UnzerApiException;
 use UnzerSDK\Resources\Payment;
 use UnzerSDK\Resources\TransactionTypes\Authorization;
 use UnzerSDK\Resources\TransactionTypes\Cancellation;
 use UnzerSDK\Resources\TransactionTypes\Charge;
-use RuntimeException;
 
 interface CancelServiceInterface
 {
@@ -68,8 +68,8 @@ public function cancelChargeById(
         $payment,
         string $chargeId,
         float $amount = null,
-        string $reasonCode = null,
-        string $referenceText = null,
+        ?string $reasonCode = null,
+        ?string $referenceText = null,
         float $amountNet = null,
         float $amountVat = null
     ): Cancellation;
@@ -94,8 +94,8 @@ public function cancelChargeById(
     public function cancelCharge(
         Charge $charge,
         float $amount = null,
-        string $reasonCode = null,
-        string $referenceText = null,
+        ?string $reasonCode = null,
+        ?string $referenceText = null,
         float $amountNet = null,
         float $amountVat = null
     ): Cancellation;
@@ -121,7 +121,7 @@ public function cancelPayment(
         $payment,
         float $amount = null,
         ?string $reasonCode = CancelReasonCodes::REASON_CODE_CANCEL,
-        string $referenceText = null,
+        ?string $referenceText = null,
         float $amountNet = null,
         float $amountVat = null
     ): array;
diff --git a/src/Interfaces/PaymentServiceInterface.php b/src/Interfaces/PaymentServiceInterface.php
@@ -9,6 +9,7 @@
 namespace UnzerSDK\Interfaces;
 
 use DateTime;
+use RuntimeException;
 use UnzerSDK\Exceptions\UnzerApiException;
 use UnzerSDK\Resources\AbstractUnzerResource;
 use UnzerSDK\Resources\Basket;
@@ -24,7 +25,6 @@
 use UnzerSDK\Resources\TransactionTypes\Charge;
 use UnzerSDK\Resources\TransactionTypes\Payout;
 use UnzerSDK\Resources\TransactionTypes\Shipment;
-use RuntimeException;
 
 interface PaymentServiceInterface
 {
@@ -230,8 +230,8 @@ public function performChargeOnPayment(
     public function chargeAuthorization(
         $payment,
         float $amount = null,
-        string $orderId = null,
-        string $invoiceId = null
+        ?string $orderId = null,
+        ?string $invoiceId = null
     ): Charge;
 
     /**
@@ -253,8 +253,8 @@ public function chargeAuthorization(
     public function chargePayment(
         $payment,
         float $amount = null,
-        string $orderId = null,
-        string $invoiceId = null
+        ?string $orderId = null,
+        ?string $invoiceId = null
     ): Charge;
 
     /**
@@ -303,7 +303,7 @@ public function payout(
      * @throws UnzerApiException An UnzerApiException is thrown if there is an error returned on API-request.
      * @throws RuntimeException  A RuntimeException is thrown when there is an error while using the SDK.
      */
-    public function ship($payment, string $invoiceId = null, string $orderId = null): Shipment;
+    public function ship($payment, ?string $invoiceId = null, ?string $orderId = null): Shipment;
 
     /**
      * Initializes a PayPage for charge transaction and returns the PayPage resource.
diff --git a/src/Interfaces/ResourceServiceInterface.php b/src/Interfaces/ResourceServiceInterface.php
@@ -57,7 +57,7 @@ public function fetchPayout($payment): Payout;
      * @throws UnzerApiException An UnzerApiException is thrown if there is an error returned on API-request.
      * @throws RuntimeException  A RuntimeException is thrown when there is an error while using the SDK.
      */
-    public function activateRecurringPayment($paymentType, string $returnUrl, string $recurrenceType = null): Recurring;
+    public function activateRecurringPayment($paymentType, string $returnUrl, ?string $recurrenceType = null): Recurring;
 
     /**
      * Fetch and return payment by given payment id or payment object.
diff --git a/src/Resources/EmbeddedResources/GooglePay/SignedMessage.php b/src/Resources/EmbeddedResources/GooglePay/SignedMessage.php
@@ -20,7 +20,7 @@ class SignedMessage extends AbstractUnzerResource
      * @param string $ephemeralPublicKey
      * @param string $encryptedMessage
      */
-    public function __construct(string $tag = null, string $ephemeralPublicKey = null, string $encryptedMessage = null)
+    public function __construct(string $tag = null, ?string $ephemeralPublicKey = null, ?string $encryptedMessage = null)
     {
         $this->tag = $tag;
         $this->ephemeralPublicKey = $ephemeralPublicKey;
diff --git a/src/Resources/InstalmentPlan.php b/src/Resources/InstalmentPlan.php
@@ -3,10 +3,10 @@
 namespace UnzerSDK\Resources;
 
 use DateTime;
+use stdClass;
 use UnzerSDK\Adapter\HttpAdapterInterface;
 use UnzerSDK\Resources\PaymentTypes\BasePaymentType;
 use UnzerSDK\Traits\CanAuthorizeWithCustomer;
-use stdClass;
 
 /**
  * Resource representing the installment plan for Installment Secured.
@@ -78,7 +78,7 @@ class InstalmentPlan extends BasePaymentType
      */
     public function __construct(
         int    $numberOfRates = null,
-        string $dayOfPurchase = null,
+        ?string $dayOfPurchase = null,
         float  $totalPurchaseAmount = null,
         float  $totalInterestAmount = null,
         float  $totalAmount = null,
diff --git a/src/Resources/Payment.php b/src/Resources/Payment.php
@@ -881,7 +881,7 @@ public function charge(float $amount = null): Charge
      * @throws UnzerApiException An UnzerApiException is thrown if there is an error returned on API-request.
      * @throws RuntimeException  A RuntimeException is thrown when there is an error while using the SDK.
      */
-    public function ship(string $invoiceId = null, string $orderId = null)
+    public function ship(string $invoiceId = null, ?string $orderId = null)
     {
         return $this->getUnzerObject()->ship($this, $invoiceId, $orderId);
     }
diff --git a/src/Resources/PaymentTypes/Card.php b/src/Resources/PaymentTypes/Card.php
@@ -2,15 +2,15 @@
 
 namespace UnzerSDK\Resources\PaymentTypes;
 
+use RuntimeException;
+use stdClass;
 use UnzerSDK\Adapter\HttpAdapterInterface;
 use UnzerSDK\Resources\EmbeddedResources\CardDetails;
 use UnzerSDK\Traits\CanAuthorize;
 use UnzerSDK\Traits\CanDirectCharge;
 use UnzerSDK\Traits\CanPayout;
 use UnzerSDK\Traits\CanRecur;
 use UnzerSDK\Validators\ExpiryDateValidator;
-use RuntimeException;
-use stdClass;
 
 /**
  * This represents the card payment type which supports credit card as well as debit card payments.
@@ -56,7 +56,7 @@ class Card extends BasePaymentType
      * @param string|null $expiryDate
      * @param string|null $email
      */
-    public function __construct(?string $number, ?string $expiryDate, string $email = null)
+    public function __construct(?string $number, ?string $expiryDate, ?string $email = null)
     {
         $this->setNumber($number);
         $this->setExpiryDate($expiryDate);
diff --git a/src/Resources/PaymentTypes/PaylaterDirectDebit.php b/src/Resources/PaymentTypes/PaylaterDirectDebit.php
@@ -12,7 +12,7 @@ class PaylaterDirectDebit extends BasePaymentType
     /** @var string $holder */
     protected $holder;
 
-    public function __construct(string $iban = null, string $holder = null)
+    public function __construct(string $iban = null, ?string $holder = null)
     {
         $this->iban = $iban;
         $this->holder = $holder;
diff --git a/src/Resources/TransactionTypes/Authorization.php b/src/Resources/TransactionTypes/Authorization.php
@@ -2,14 +2,14 @@
 
 namespace UnzerSDK\Resources\TransactionTypes;
 
+use RuntimeException;
 use UnzerSDK\Adapter\HttpAdapterInterface;
 use UnzerSDK\Exceptions\UnzerApiException;
 use UnzerSDK\Resources\Payment;
 use UnzerSDK\Traits\HasAccountInformation;
 use UnzerSDK\Traits\HasCancellations;
 use UnzerSDK\Traits\HasDescriptor;
 use UnzerSDK\Traits\HasRecurrenceType;
-use RuntimeException;
 
 /**
  * This represents the authorization transaction.
@@ -55,7 +55,7 @@ class Authorization extends AbstractTransactionType
      * @param string|null $currency
      * @param string|null $returnUrl
      */
-    public function __construct(float $amount = null, string $currency = null, string $returnUrl = null)
+    public function __construct(float $amount = null, ?string $currency = null, ?string $returnUrl = null)
     {
         $this->setAmount($amount);
         $this->setCurrency($currency);
diff --git a/src/Resources/TransactionTypes/Charge.php b/src/Resources/TransactionTypes/Charge.php
@@ -2,14 +2,14 @@
 
 namespace UnzerSDK\Resources\TransactionTypes;
 
+use RuntimeException;
 use UnzerSDK\Adapter\HttpAdapterInterface;
 use UnzerSDK\Exceptions\UnzerApiException;
 use UnzerSDK\Traits\HasAccountInformation;
 use UnzerSDK\Traits\HasCancellations;
 use UnzerSDK\Traits\HasChargebacks;
 use UnzerSDK\Traits\HasDescriptor;
 use UnzerSDK\Traits\HasRecurrenceType;
-use RuntimeException;
 
 /**
  * This represents the charge transaction.
@@ -47,7 +47,7 @@ class Charge extends AbstractTransactionType
      * @param string|null $currency
      * @param string|null $returnUrl
      */
-    public function __construct(float $amount = null, string $currency = null, string $returnUrl = null)
+    public function __construct(float $amount = null, ?string $currency = null, ?string $returnUrl = null)
     {
         $this->setAmount($amount);
         $this->setCurrency($currency);
@@ -200,8 +200,8 @@ protected function getResourcePath(string $httpMethod = HttpAdapterInterface::RE
      */
     public function cancel(
         float  $amount = null,
-        string $reasonCode = null,
-        string $paymentReference = null,
+        ?string $reasonCode = null,
+        ?string $paymentReference = null,
         float  $amountNet = null,
         float  $amountVat = null
     ): Cancellation {
diff --git a/src/Resources/TransactionTypes/Payout.php b/src/Resources/TransactionTypes/Payout.php
@@ -31,7 +31,7 @@ class Payout extends AbstractTransactionType
      * @param string|null $currency
      * @param null        $returnUrl
      */
-    public function __construct(float $amount = null, string $currency = null, $returnUrl = null)
+    public function __construct(float $amount = null, ?string $currency = null, $returnUrl = null)
     {
         $this->setAmount($amount);
         $this->setCurrency($currency);
diff --git a/src/Services/CancelService.php b/src/Services/CancelService.php
@@ -12,7 +12,6 @@
 use UnzerSDK\Resources\TransactionTypes\Cancellation;
 use UnzerSDK\Resources\TransactionTypes\Charge;
 use UnzerSDK\Unzer;
-
 use function in_array;
 use function is_string;
 
@@ -93,8 +92,8 @@ public function cancelChargeById(
         $payment,
         string $chargeId,
         float $amount = null,
-        string $reasonCode = null,
-        string $referenceText = null,
+        ?string $reasonCode = null,
+        ?string $referenceText = null,
         float $amountNet = null,
         float $amountVat = null
     ): Cancellation {
@@ -108,8 +107,8 @@ public function cancelChargeById(
     public function cancelCharge(
         Charge $charge,
         float $amount = null,
-        string $reasonCode = null,
-        string $referenceText = null,
+        ?string $reasonCode = null,
+        ?string $referenceText = null,
         float $amountNet = null,
         float $amountVat = null
     ): Cancellation {
@@ -133,7 +132,7 @@ public function cancelPayment(
         $payment,
         float $amount = null,
         ?string $reasonCode = CancelReasonCodes::REASON_CODE_CANCEL,
-        string $referenceText = null,
+        ?string $referenceText = null,
         float $amountNet = null,
         float $amountVat = null
     ): array {
diff --git a/src/Services/HttpService.php b/src/Services/HttpService.php
@@ -100,7 +100,7 @@ public function send(
         ?string                $uri = null,
         ?AbstractUnzerResource $resource = null,
         string                 $httpMethod = HttpAdapterInterface::REQUEST_GET,
-        string $apiVersion = null
+        ?string $apiVersion = null
     ): string {
         if (!$resource instanceof AbstractUnzerResource) {
             throw new RuntimeException('Transfer object is empty!');
diff --git a/src/Services/PaymentService.php b/src/Services/PaymentService.php
@@ -215,8 +215,8 @@ public function charge(
     public function chargeAuthorization(
         $payment,
         float $amount = null,
-        string $orderId = null,
-        string $invoiceId = null
+        ?string $orderId = null,
+        ?string $invoiceId = null
     ): Charge {
         return $this->chargePayment($payment, $amount, $orderId, $invoiceId);
     }
@@ -227,8 +227,8 @@ public function chargeAuthorization(
     public function chargePayment(
         $payment,
         float $amount = null,
-        string $orderId = null,
-        string $invoiceId = null
+        ?string $orderId = null,
+        ?string $invoiceId = null
     ): Charge {
         $charge = new Charge($amount);
 
@@ -267,7 +267,7 @@ public function payout(
         Metadata $metadata = null,
         Basket   $basket = null,
         string   $invoiceId = null,
-        string $referenceText = null
+        ?string $referenceText = null
     ): Payout {
         $payment = $this->createPayment($paymentType);
         $payout = (new Payout($amount, $currency, $returnUrl))
@@ -283,7 +283,7 @@ public function payout(
     /**
      * {@inheritDoc}
      */
-    public function ship($payment, string $invoiceId = null, string $orderId = null): Shipment
+    public function ship($payment, ?string $invoiceId = null, ?string $orderId = null): Shipment
     {
         $shipment = new Shipment();
         $shipment->setInvoiceId($invoiceId)->setOrderId($orderId);
diff --git a/src/Services/ResourceService.php b/src/Services/ResourceService.php
diff --git a/src/Traits/CanPayout.php b/src/Traits/CanPayout.php
diff --git a/src/Traits/CanPayoutWithCustomer.php b/src/Traits/CanPayoutWithCustomer.php
diff --git a/src/Unzer.php b/src/Unzer.php
diff --git a/test/unit/Services/DummyAdapter.php b/test/unit/Services/DummyAdapter.php

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function validMerchantValidationDomain(string $merchantValidationURL): bo`
`67`	`67`	`* This is necessary if the ssl cert file doesn't contain key already.`
`68`	`68`	`* @param string\|null $caCert Path to CA certificate.`
`69`	`69`	`*/`
`70`		`- public function init(string $sslCert, string $sslKey = null, string $caCert = null): void`
	`70`	`+ public function init(string $sslCert, ?string $sslKey = null, ?string $caCert = null): void`
`71`	`71`	`{`
`72`	`72`	`$timeout = EnvironmentService::getTimeout();`
`73`	`73`	`$curlVerbose = EnvironmentService::isCurlVerbose();`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class UnzerApiException extends Exception`
`29`	`29`	`* @param string $code`
`30`	`30`	`* @param string\|null $errorId`
`31`	`31`	`*/`
`32`		`- public function __construct($merchantMessage = '', $clientMessage = '', $code = null, string $errorId = null)`
	`32`	`+ public function __construct($merchantMessage = '', $clientMessage = '', $code = null, ?string $errorId = null)`
`33`	`33`	`{`
`34`	`34`	`$merchantMessage = empty($merchantMessage) ? static::MESSAGE : $merchantMessage;`
`35`	`35`	`$this->clientMessage = empty($clientMessage) ? static::CLIENT_MESSAGE : $clientMessage;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class SignedMessage extends AbstractUnzerResource`
`20`	`20`	`* @param string $ephemeralPublicKey`
`21`	`21`	`* @param string $encryptedMessage`
`22`	`22`	`*/`
`23`		`- public function __construct(string $tag = null, string $ephemeralPublicKey = null, string $encryptedMessage = null)`
	`23`	`+ public function __construct(string $tag = null, ?string $ephemeralPublicKey = null, ?string $encryptedMessage = null)`
`24`	`24`	`{`
`25`	`25`	`$this->tag = $tag;`
`26`	`26`	`$this->ephemeralPublicKey = $ephemeralPublicKey;`
Original file line number	Diff line number	Diff line change
`@@ -881,7 +881,7 @@ public function charge(float $amount = null): Charge`
`881`	`881`	`* @throws UnzerApiException An UnzerApiException is thrown if there is an error returned on API-request.`
`882`	`882`	`* @throws RuntimeException A RuntimeException is thrown when there is an error while using the SDK.`
`883`	`883`	`*/`
`884`		`- public function ship(string $invoiceId = null, string $orderId = null)`
	`884`	`+ public function ship(string $invoiceId = null, ?string $orderId = null)`
`885`	`885`	`{`
`886`	`886`	`return $this->getUnzerObject()->ship($this, $invoiceId, $orderId);`
`887`	`887`	`}`