Make CardUniqueReference nullable on webhook events

sebdesign · Apr 28, 2023 · f9c8b34 · f9c8b34
1 parent a6a0a95
commit f9c8b34
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,9 +5,15 @@ All notable changes to `sebdesign/laravel-viva-payments` will be documented in t
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [6.0.1] - 2023-04-28
+
+### Fixed
+
+-   Make `CardUniqueReference` nullable on webhook events
+
 ## [6.0.0] - 2023-04-01
 
-### Added
+### Fixed
 
 -   Fix webhook events
 

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -15,8 +15,8 @@ parameters:
 
     typeAliases:
         RecurringTransactionArray: 'array{Emv:?string, Amount:float, StatusId:string, RedirectUrl:?string, CurrencyCode:string, TransactionId:string, TransactionTypeId:int, ReferenceNumber:int, IssuerMessage:?string, AuthorizationId:string, IssuerMessageControl:mixed, Ctap:mixed, RetrievalReferenceNumber:string, Loyalty:?string, CartesBancaires:?string, ThreeDSecureStatusId:int, ErrorCode:int, ErrorText:?string, TimeStamp:string, CorrelationId:?string, EventId:int, Success:bool}'
-        TransactionFailedArray: 'array{Moto:bool, Email:string, Phone:?string, BankId:string, Systemic:bool, Switching:bool, ParentId:?string, Amount:float, ChannelId:string, TerminalId:int, MerchantId:string, OrderCode:string, ProductId:?string, StatusId:string, FullName:string, ResellerId:?string, InsDate:string, TotalFee:float, CardUniqueReference:string, CardToken:string, CardNumber:string, TipAmount:float, SourceCode:string, SourceName:string, Latitude:?float, Longitude:?float, CompanyName:?String, TransactionId:string, CompanyTitle:?string, PanEntryMode:string, ReferenceNumber:int, ResponseCode:?string, CurrencyCode:string, OrderCulture:string, MerchantTrns:?string, CustomerTrns:string, IsManualRefund:bool, TargetPersonId:?string, TargetWalletId:?string, LoyaltyTriggered:bool, TransactionTypeId:int, TotalInstallments:int, CardCountryCode:?string, CardIssuingBank:?string, RedeemedAmount:int, ClearanceDate:?int, CurrentInstallment:?int, Tags:string[], BillId:?string, ResellerSourceCode:?string, ResellerSourceName:?string, ResellerCompanyName:?string, ResellerSourceAddress:?string, CardExpirationDate:string, RetrievalReferenceNumber:?string, AssignedMerchantUsers:string[], AssignedResellerUsers:string[], CardTypeId:int, DigitalWalletId:?int, ResponseEventId:?string, ElectronicCommerceIndicator:?string}'
-        TransactionPaymentCreatedArray: 'array{Moto:bool, Email:string, Phone:?string, BankId:string, Systemic:bool, Switching:bool, ParentId:?string, Amount:float, ChannelId:string, TerminalId:int, MerchantId:string, OrderCode:string, ProductId:?string, StatusId:string, FullName:string, ResellerId:?string, InsDate:string, TotalFee:float, CardUniqueReference:string, CardToken:string, CardNumber:string, TipAmount:float, SourceCode:string, SourceName:string, Latitude:?float, Longitude:?float, CompanyName:?String, TransactionId:string, CompanyTitle:?string, PanEntryMode:string, ReferenceNumber:int, ResponseCode:?string, CurrencyCode:string, OrderCulture:string, MerchantTrns:?string, CustomerTrns:string, IsManualRefund:bool, TargetPersonId:?string, TargetWalletId:?string, LoyaltyTriggered:bool, TransactionTypeId:int, TotalInstallments:int, CardCountryCode:?string, CardIssuingBank:?string, RedeemedAmount:int, ClearanceDate:?int, CurrentInstallment:?int, Tags:string[], BillId:?string, ResellerSourceCode:?string, ResellerSourceName:?string, ResellerCompanyName:?string, ResellerSourceAddress:?string, CardExpirationDate:string, RetrievalReferenceNumber:?string, AssignedMerchantUsers:string[], AssignedResellerUsers:string[], CardTypeId:int, DigitalWalletId:?int, ResponseEventId:?string, ElectronicCommerceIndicator:?string, BinId:?string, Ucaf:?string, DualMessage:?string, AcquirerApproved:?string, AuthorizationId:?string, OrderServiceId:?string, ConnectedAccountId:?string}'
+        TransactionFailedArray: 'array{Moto:bool, Email:string, Phone:?string, BankId:string, Systemic:bool, Switching:bool, ParentId:?string, Amount:float, ChannelId:string, TerminalId:int, MerchantId:string, OrderCode:string, ProductId:?string, StatusId:string, FullName:string, ResellerId:?string, InsDate:string, TotalFee:float, CardUniqueReference:?string, CardToken:string, CardNumber:string, TipAmount:float, SourceCode:string, SourceName:string, Latitude:?float, Longitude:?float, CompanyName:?String, TransactionId:string, CompanyTitle:?string, PanEntryMode:string, ReferenceNumber:int, ResponseCode:?string, CurrencyCode:string, OrderCulture:string, MerchantTrns:?string, CustomerTrns:string, IsManualRefund:bool, TargetPersonId:?string, TargetWalletId:?string, LoyaltyTriggered:bool, TransactionTypeId:int, TotalInstallments:int, CardCountryCode:?string, CardIssuingBank:?string, RedeemedAmount:int, ClearanceDate:?int, CurrentInstallment:?int, Tags:string[], BillId:?string, ResellerSourceCode:?string, ResellerSourceName:?string, ResellerCompanyName:?string, ResellerSourceAddress:?string, CardExpirationDate:string, RetrievalReferenceNumber:?string, AssignedMerchantUsers:string[], AssignedResellerUsers:string[], CardTypeId:int, DigitalWalletId:?int, ResponseEventId:?string, ElectronicCommerceIndicator:?string}'
+        TransactionPaymentCreatedArray: 'array{Moto:bool, Email:string, Phone:?string, BankId:string, Systemic:bool, Switching:bool, ParentId:?string, Amount:float, ChannelId:string, TerminalId:int, MerchantId:string, OrderCode:string, ProductId:?string, StatusId:string, FullName:string, ResellerId:?string, InsDate:string, TotalFee:float, CardUniqueReference:?string, CardToken:string, CardNumber:string, TipAmount:float, SourceCode:string, SourceName:string, Latitude:?float, Longitude:?float, CompanyName:?String, TransactionId:string, CompanyTitle:?string, PanEntryMode:string, ReferenceNumber:int, ResponseCode:?string, CurrencyCode:string, OrderCulture:string, MerchantTrns:?string, CustomerTrns:string, IsManualRefund:bool, TargetPersonId:?string, TargetWalletId:?string, LoyaltyTriggered:bool, TransactionTypeId:int, TotalInstallments:int, CardCountryCode:?string, CardIssuingBank:?string, RedeemedAmount:int, ClearanceDate:?int, CurrentInstallment:?int, Tags:string[], BillId:?string, ResellerSourceCode:?string, ResellerSourceName:?string, ResellerCompanyName:?string, ResellerSourceAddress:?string, CardExpirationDate:string, RetrievalReferenceNumber:?string, AssignedMerchantUsers:string[], AssignedResellerUsers:string[], CardTypeId:int, DigitalWalletId:?int, ResponseEventId:?string, ElectronicCommerceIndicator:?string, BinId:?string, Ucaf:?string, DualMessage:?string, AcquirerApproved:?string, AuthorizationId:?string, OrderServiceId:?string, ConnectedAccountId:?string}'
         TransactionArray: 'array{email:string, amount:int, orderCode:string, statusId:string, fullName:string, insDate:string, cardNumber:string, currencyCode:string, customerTrns:string, merchantTrns:?string, transactionTypeId:int, recurringSupport:bool, totalInstallments:int, cardCountryCode:?string, cardIssuingBank:?string, currentInstallment:int, cardUniqueReference:?string, cardTypeId:int, digitalWalletId:?int}'
         WebhookEventDataArray: 'TransactionPaymentCreatedArray|TransactionFailedArray|array<string,mixed>'
         WebhookEventArray: 'array{Url:string, EventData:WebhookEventDataArray, Created:string, CorrelationId:string, EventTypeId:int, Delay:?string, MessageId:string, RecipientId:string, MessageTypeId:int}'

diff --git a/src/Events/TransactionFailed.php b/src/Events/TransactionFailed.php
@@ -27,7 +27,7 @@ public function __construct(
         public readonly ?string $ResellerId,
         public readonly string $InsDate,
         public readonly float $TotalFee,
-        public readonly string $CardUniqueReference,
+        public readonly ?string $CardUniqueReference,
         public readonly string $CardToken,
         public readonly string $CardNumber,
         public readonly float $TipAmount,
@@ -98,7 +98,7 @@ public static function create(array $attributes): self
             ResellerId: $attributes['ResellerId'] ?? null,
             InsDate: $attributes['InsDate'],
             TotalFee: $attributes['TotalFee'],
-            CardUniqueReference: $attributes['CardUniqueReference'],
+            CardUniqueReference: $attributes['CardUniqueReference'] ?? null,
             CardToken: $attributes['CardToken'],
             CardNumber: $attributes['CardNumber'],
             TipAmount: $attributes['TipAmount'],

diff --git a/src/Events/TransactionPaymentCreated.php b/src/Events/TransactionPaymentCreated.php
@@ -27,7 +27,7 @@ public function __construct(
         public readonly ?string $ResellerId,
         public readonly string $InsDate,
         public readonly float $TotalFee,
-        public readonly string $CardUniqueReference,
+        public readonly ?string $CardUniqueReference,
         public readonly string $CardToken,
         public readonly string $CardNumber,
         public readonly float $TipAmount,