Use native types where possible

Ticketpark · Jul 11, 2024 · 4b2e80f · 4b2e80f
1 parent cbf95db
commit 4b2e80f
Show file tree

Hide file tree

Showing 29 changed files with 21 additions and 89 deletions.
diff --git a/lib/SaferpayJson/Request/Container/A2a.php b/lib/SaferpayJson/Request/Container/A2a.php
@@ -9,10 +9,9 @@
 final class A2a
 {
     /**
-     * @var string
      * @SerializedName("AccountHolderName")
      */
-    private $accountHolderName;
+    private string $accountHolderName;
 
     public function __construct(string $accountHolderName)
     {

diff --git a/lib/SaferpayJson/Request/Container/Address.php b/lib/SaferpayJson/Request/Container/Address.php
@@ -64,7 +64,6 @@ final class Address
     private ?\DateTime $dateOfBirth = null;
 
     /**
-     * @var string|null
      * @SerializedName("Street2")
      */
     private ?string $street2 = null;

diff --git a/lib/SaferpayJson/Request/Container/Amount.php b/lib/SaferpayJson/Request/Container/Amount.php
@@ -5,13 +5,11 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class Amount
 {
     /**
      * @SerializedName("Value")
-     * @Type("integer")
      */
     private int $value;
 

diff --git a/lib/SaferpayJson/Request/Container/Card.php b/lib/SaferpayJson/Request/Container/Card.php
@@ -5,7 +5,6 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class Card
 {
@@ -16,13 +15,11 @@ final class Card
 
     /**
      * @SerializedName("ExpYear")
-     * @Type("integer")
      */
     private ?int $expYear = null;
 
     /**
      * @SerializedName("ExpMonth")
-     * @Type("integer")
      */
     private ?int $expMonth = null;
 

diff --git a/lib/SaferpayJson/Request/Container/ChosenPlan.php b/lib/SaferpayJson/Request/Container/ChosenPlan.php
@@ -5,13 +5,11 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class ChosenPlan
 {
     /**
      * @SerializedName("NumberOfInstallments")
-     * @Type("int")
      */
     private int $numberOfInstallments;
 
@@ -22,7 +20,6 @@ final class ChosenPlan
 
     /**
      * @SerializedName("InstallmentFee")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Amount")
      */
     private ?Amount $installmentFee = null;
 
@@ -33,19 +30,16 @@ final class ChosenPlan
 
     /**
      * @SerializedName("FirstInstallmentAmount")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Amount")
      */
     private ?Amount $firstInstallmentAmount = null;
 
     /**
      * @SerializedName("SubsequentInstallmentAmount")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Amount")
      */
     private ?Amount $subsequentInstallmentAmount = null;
 
     /**
      * @SerializedName("TotalAmountDue")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Amount")
      */
     private ?Amount $totalAmountDue = null;
 

diff --git a/lib/SaferpayJson/Request/Container/IssuerReference.php b/lib/SaferpayJson/Request/Container/IssuerReference.php
@@ -5,19 +5,16 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class IssuerReference
 {
     /**
      * @SerializedName("TransactionStamp")
-     * @Type("string")
      */
     private string $transactionStamp;
 
     /**
      * @SerializedName("SettlementDate")
-     * @Type("string")
      */
     private ?string $settlementDate = null;
 

diff --git a/lib/SaferpayJson/Request/Container/Klarna.php b/lib/SaferpayJson/Request/Container/Klarna.php
@@ -5,13 +5,11 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class Klarna
 {
     /**
      * @SerializedName("Attachment")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Attachment")
      */
     private Attachment $attachment;
 

diff --git a/lib/SaferpayJson/Request/Container/MastercardIssuerInstallments.php b/lib/SaferpayJson/Request/Container/MastercardIssuerInstallments.php
@@ -5,13 +5,11 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class MastercardIssuerInstallments
 {
     /**
      * @SerializedName("ChosenPlan")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\ChosenPlan")
      */
     private ?ChosenPlan $chosenPlan = null;
 

diff --git a/lib/SaferpayJson/Request/Container/Notification.php b/lib/SaferpayJson/Request/Container/Notification.php
@@ -9,7 +9,7 @@
 final class Notification
 {
     /**
-     * @var array<string>|null
+     * @var array<string>
      * @SerializedName("MerchantEmails")
      */
     private ?array $merchantEmails = [];
@@ -23,7 +23,7 @@ final class Notification
      * @var string|null
      * @SerializedName("PayerDccReceiptEmail")
      */
-    private $payerDccReceiptEmail;
+    private ?string $payerDccReceiptEmail = null;
 
     /**
      * @var string|null

diff --git a/lib/SaferpayJson/Request/Container/Order.php b/lib/SaferpayJson/Request/Container/Order.php
@@ -9,7 +9,7 @@
 final class Order
 {
     /**
-     * @var array<OrderItem>|null
+     * @var array<OrderItem>
      * @SerializedName("Items")
      */
     private ?array $items = [];

diff --git a/lib/SaferpayJson/Request/Container/Payer.php b/lib/SaferpayJson/Request/Container/Payer.php
@@ -5,7 +5,6 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class Payer
 {
@@ -25,13 +24,11 @@ final class Payer
 
     /**
      * @SerializedName("DeliveryAddress")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Address")
      */
     private ?Address $deliveryAddress = null;
 
     /**
      * @SerializedName("BillingAddress")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Address")
      */
     private ?Address $billingAddress = null;
 

diff --git a/lib/SaferpayJson/Request/Container/PaymentMeans.php b/lib/SaferpayJson/Request/Container/PaymentMeans.php
@@ -5,13 +5,11 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class PaymentMeans
 {
     /**
      * @SerializedName("Brand")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Brand")
      */
     private ?Brand $brand = null;
 
@@ -27,49 +25,41 @@ final class PaymentMeans
 
     /**
      * @SerializedName("Card")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Card")
      */
     private ?Card $card = null;
 
     /**
      * @SerializedName("BankAccount")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\BankAccount")
      */
     private ?BankAccount $bankAccount = null;
 
     /**
      * @SerializedName("Twint")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Twint")
      */
     private ?Twint $twint = null;
 
     /**
      * @SerializedName("SaferpayFields")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\SaferpayFields")
      */
     private ?SaferpayFields $saferpayFields = null;
 
     /**
      * @SerializedName("Alias")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Alias")
      */
     private ?Alias $alias = null;
 
     /**
      * @SerializedName("SchemeToken")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\SchemeToken")
      */
     private ?SchemeToken $schemeToken = null;
 
     /**
      * @SerializedName("ApplePay")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\ApplePay")
      */
     private ?ApplePay $applePay = null;
 
     /**
      * @SerializedName("GooglePay")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\GooglePay")
      */
     private ?GooglePay $googlePay = null;
 

diff --git a/lib/SaferpayJson/Request/Container/PaymentMethodsOptions.php b/lib/SaferpayJson/Request/Container/PaymentMethodsOptions.php
@@ -5,20 +5,16 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class PaymentMethodsOptions
 {
     /**
-     * @var Ideal|null
      * @SerializedName("Ideal")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Ideal")
      */
     private ?Ideal $ideal = null;
 
     /**
      * @SerializedName("Klarna")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Klarna")
      */
     private ?Klarna $klarna = null;
 

diff --git a/lib/SaferpayJson/Request/Container/PendingNotification.php b/lib/SaferpayJson/Request/Container/PendingNotification.php
@@ -9,7 +9,7 @@
 final class PendingNotification
 {
     /**
-     * @var array<string>|null
+     * @var array<string>
      * @SerializedName("MerchantEmails")
      */
     private ?array $merchantEmails = [];

diff --git a/lib/SaferpayJson/Request/Container/Refund.php b/lib/SaferpayJson/Request/Container/Refund.php
@@ -5,15 +5,13 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class Refund
 {
     /**
      * @SerializedName("Amount")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\Amount")
      */
-    private ?Amount $amount = null;
+    private ?Amount $amount;
 
     /**
      * @SerializedName("OrderId")

diff --git a/lib/SaferpayJson/Request/Container/RegisterAlias.php b/lib/SaferpayJson/Request/Container/RegisterAlias.php
@@ -5,7 +5,6 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class RegisterAlias
 {
@@ -25,7 +24,6 @@ final class RegisterAlias
 
     /**
      * @SerializedName("Lifetime")
-     * @Type("integer")
      */
     private ?int $lifetime = null;
 

diff --git a/lib/SaferpayJson/Request/Container/RequestHeader.php b/lib/SaferpayJson/Request/Container/RequestHeader.php
@@ -21,12 +21,12 @@ final class RequestHeader
     /**
      * @SerializedName("RequestId")
      */
-    private ?string $requestId = null;
+    private ?string $requestId;
 
     /**
      * @SerializedName("RetryIndicator")
      */
-    private int $retryIndicator = 0;
+    private int $retryIndicator;
 
     /**
      * @SerializedName("ClientInfo")

diff --git a/lib/SaferpayJson/Request/Container/ReturnUrl.php b/lib/SaferpayJson/Request/Container/ReturnUrl.php
@@ -9,10 +9,9 @@
 final class ReturnUrl
 {
     /**
-     * @var string
      * @SerializedName("Url")
      */
-    private $url;
+    private string $url;
 
     public function __construct(string $url)
     {

diff --git a/lib/SaferpayJson/Request/Container/RiskFactors.php b/lib/SaferpayJson/Request/Container/RiskFactors.php
@@ -5,7 +5,6 @@
 namespace Ticketpark\SaferpayJson\Request\Container;
 
 use JMS\Serializer\Annotation\SerializedName;
-use JMS\Serializer\Annotation\Type;
 
 final class RiskFactors
 {
@@ -22,7 +21,6 @@ final class RiskFactors
 
     /**
      * @SerializedName("PayerProfile")
-     * @Type("Ticketpark\SaferpayJson\Request\Container\PayerProfile")
      */
     private ?PayerProfile $payerProfile = null;
 
@@ -32,10 +30,9 @@ final class RiskFactors
     private ?bool $isB2B = null;
 
     /**
-     * @var string|null
      * @SerializedName("DeviceFingerprintTransactionId")
      */
-    private $deviceFingerprintTransactionId;
+    private ?string $deviceFingerprintTransactionId = null;
 
     public function getDeliveryType(): ?string
     {