DRAFT: Webhook: non required fields

Pavel Chugunov · Pavel Chugunov · commit 0dea1c9aef79 · 2025-07-18T15:27:43.000+03:00
diff --git a/src/CardDetails.php b/src/CardDetails.php
@@ -55,7 +55,7 @@ public function setNumber(string $number): self
     /** @inheritDoc */
     public function getExpiryMonth(): ?int
     {
-        return $this->expiryMonth;
+        return $this->expiryMonth ?? null;
     }
 
     /** @inheritDoc */
@@ -68,7 +68,7 @@ public function setExpiryMonth(int $expiryMonth): self
     /** @inheritDoc */
     public function getYear(): ?int
     {
-        return $this->year;
+        return $this->year ?? null;
     }
 
     /** @inheritDoc */
@@ -85,7 +85,7 @@ public function setYear(int $year): self
     /** @inheritDoc */
     public function getExpiryYear(): ?int
     {
-        return $this->expiryYear;
+        return $this->expiryYear ?? null;
     }
 
     /** @inheritDoc */
@@ -98,7 +98,7 @@ public function setExpiryYear(int $expiryYear): self
     /** @inheritDoc */
     public function getCvv(): ?string
     {
-        return $this->cvv;
+        return $this->cvv ?? null;
     }
 
     /** @inheritDoc */
@@ -111,7 +111,7 @@ public function setCvv(string $cvv): self
     /** @inheritDoc */
     public function getOwner(): ?string
     {
-        return $this->owner;
+        return $this->owner ?? null;
     }
 
     /** @inheritDoc */
@@ -124,7 +124,7 @@ public function setOwner(string $owner): self
     /** @inheritDoc */
     public function getTimeSpentTypingNumber(): ?int
     {
-        return $this->timeSpentTypingNumber;
+        return $this->timeSpentTypingNumber ?? null;
     }
 
     /** @inheritDoc */
@@ -137,7 +137,7 @@ public function setTimeSpentTypingNumber(int $timeSpentTypingNumber): self
     /** @inheritDoc */
     public function getTimeSpentTypingOwner(): ?int
     {
-        return $this->timeSpentTypingOwner;
+        return $this->timeSpentTypingOwner ?? null;
     }
 
     /** @inheritDoc */
@@ -150,7 +150,7 @@ public function setTimeSpentTypingOwner(int $timeSpentTypingOwner): self
     /** @inheritDoc */
     public function getBin(): ?int
     {
-        return $this->bin;
+        return $this->bin ?? null;
     }
 
     /** @inheritDoc */
@@ -163,7 +163,7 @@ public function setBin(int $bin): self
     /** @inheritDoc */
     public function getPan(): ?string
     {
-        return $this->pan;
+        return $this->pan ?? null;
     }
 
     /** @inheritDoc */
@@ -176,7 +176,7 @@ public function setPan(string $pan): self
     /** @inheritDoc */
     public function getType(): ?string
     {
-        return $this->type;
+        return $this->type ?? null;
     }
 
     /** @inheritDoc */
@@ -189,7 +189,7 @@ public function setType(string $type): self
     /** @inheritDoc */
     public function getCardIssuerBank(): ?string
     {
-        return $this->cardIssuerBank;
+        return $this->cardIssuerBank ?? null;
     }
 
     /** @inheritDoc */
diff --git a/src/OrderData.php b/src/OrderData.php
@@ -37,7 +37,7 @@ class OrderData implements OrderDataInterface
     /** @inheritDoc */
     public function getOrderDate(): ?string
     {
-        return $this->orderDate;
+        return $this->orderDate ?? null;
     }
 
     /** @inheritDoc */
@@ -59,7 +59,7 @@ public function setYpmnPaymentReference(string $ypmnPaymentReference): self
     /** @inheritDoc */
     public function getYpmnPaymentReference(): ?string
     {
-        return $this->payUPaymentReference;
+        return $this->payUPaymentReference ?? null;
     }
 
     /** @inheritDoc */
@@ -73,13 +73,13 @@ public function setPayUPaymentReference(string $payUPaymentReference): self
     /** @inheritDoc */
     public function getPayUPaymentReference(): ?string
     {
-        return $this->payUPaymentReference;
+        return $this->payUPaymentReference ?? null;
     }
 
     /** @inheritDoc */
     public function getMerchantPaymentReference(): ?string
     {
-        return $this->merchantPaymentReference;
+        return $this->merchantPaymentReference ?? null;
     }
 
     /** @inheritDoc */
@@ -93,7 +93,7 @@ public function setMerchantPaymentReference(string $merchantPaymentReference): s
     /** @inheritDoc */
     public function getStatus(): ?string
     {
-        return $this->status;
+        return $this->status ?? null;
     }
 
     /** @inheritDoc */
@@ -107,7 +107,7 @@ public function setStatus(string $status): self
     /** @inheritDoc */
     public function getCurrency(): ?string
     {
-        return $this->currency;
+        return $this->currency ?? null;
     }
 
     /** @inheritDoc */
@@ -121,7 +121,7 @@ public function setCurrency(string $currency): self
     /** @inheritDoc */
     public function getAmount(): ?float
     {
-        return $this->amount;
+        return $this->amount ?? null;
     }
 
     /** @inheritDoc */
@@ -135,7 +135,7 @@ public function setAmount(float $amount): self
     /** @inheritDoc */
     public function getCommission(): ?float
     {
-        return $this->commission;
+        return $this->commission ?? null;
     }
 
     /** @inheritDoc */
@@ -151,7 +151,7 @@ public function setCommission(float $commission): self
     /** @inheritDoc */
     public function getRefundRequestId(): ?string
     {
-        return $this->refundRequestId;
+        return $this->refundRequestId ?? null;
     }
 
     /** @inheritDoc */
@@ -164,7 +164,7 @@ public function setRefundRequestId(string $refundRequestId): self
     /** @inheritDoc */
     public function getLoyaltyPointsAmount(): ?int
     {
-        return $this->loyaltyPointsAmount;
+        return $this->loyaltyPointsAmount ?? null;
     }
 
     /** @inheritDoc */
@@ -178,7 +178,7 @@ public function setLoyaltyPointsAmount(int $loyaltyPointsAmount): self
     /** @inheritDoc */
     public function getLoyaltyPointsDetails(): ?array
     {
-        return $this->loyaltyPointsDetails;
+        return $this->loyaltyPointsDetails ?? null;
     }
 
     /** @inheritDoc */
diff --git a/src/PaymentResult.php b/src/PaymentResult.php
@@ -43,7 +43,7 @@ class PaymentResult implements PaymentResultInterface
     /** @inheritDoc */
     public function getPaymentMethod(): ?string
     {
-        return $this->paymentMethod;
+        return $this->paymentMethod ?? null;
     }
 
     /** @inheritDoc */
@@ -56,7 +56,7 @@ public function setPaymentMethod(string $paymentMethod): self
     /** @inheritDoc */
     public function getPaymentDate(): ?string
     {
-        return $this->paymentDate;
+        return $this->paymentDate ?? null;
     }
 
     /** @inheritDoc */
@@ -69,7 +69,7 @@ public function setPaymentDate(string $paymentDate): self
     /** @inheritDoc */
     public function getCaptureDate(): ?string
     {
-        return $this->captureDate;
+        return $this->captureDate ?? null;
     }
 
     /** @inheritDoc */
@@ -82,7 +82,7 @@ public function setCaptureDate(string $captureDate): self
     /** @inheritDoc */
     public function getCardProgramName(): ?string
     {
-        return $this->cardProgramName;
+        return $this->cardProgramName ?? null;
     }
 
     /** @inheritDoc */
@@ -95,7 +95,7 @@ public function setCardProgramName(string $cardProgramName): self
     /** @inheritDoc */
     public function getAuthCode(): ?string
     {
-        return $this->authCode;
+        return $this->authCode ?? null;
     }
 
     /** @inheritDoc */
@@ -108,7 +108,7 @@ public function setAuthCode(string $authCode): self
     /** @inheritDoc */
     public function getMerchantId(): ?string
     {
-        return $this->merchantId;
+        return $this->merchantId ?? null;
     }
 
     /** @inheritDoc */
@@ -121,7 +121,7 @@ public function setMerchantId(string $merchantId): self
     /** @inheritDoc */
     public function getRrn(): ?int
     {
-        return $this->rrn;
+        return $this->rrn ?? null;
     }
 
     /** @inheritDoc */
@@ -134,7 +134,7 @@ public function setRrn(int $rrn): self
     /** @inheritDoc */
     public function getInstallmentsNumber(): ?string
     {
-        return $this->installmentsNumber;
+        return $this->installmentsNumber ?? null;
     }
 
     /** @inheritDoc */
@@ -154,13 +154,13 @@ public function setCardDetails(CardDetailsInterface $cardDetails): self
     /** @inheritDoc */
     public function getCardDetails() : CardDetailsInterface
     {
-        return $this->cardDetails;
+        return $this->cardDetails ?? new CardDetails();
     }
 
     /** @inheritDoc */
     public function getPaymentBankShortName(): ?string
     {
-        return $this->paymentBankShortName;
+        return $this->paymentBankShortName ?? null;
     }
 
     /** @inheritDoc */
@@ -173,7 +173,7 @@ public function setPaymentBankShortName(string $paymentBankShortName): self
     /** @inheritDoc */
     public function getServiceProcessingType(): ?string
     {
-        return $this->serviceProcessingType;
+        return $this->serviceProcessingType ?? null;
     }
 
     /** @inheritDoc */
diff --git a/src/Webhook.php b/src/Webhook.php
@@ -50,7 +50,7 @@ public function catchJsonRequest(): self
         }
 
         if (!empty($request['orderData']['amount'])) {
-            $this->orderData->setAmount($request['orderData']['amount']);
+            $this->orderData->setAmount((float) $request['orderData']['amount']);
         }
 
         if (isset($request['orderData']['commission'])) {
@@ -69,7 +69,7 @@ public function catchJsonRequest(): self
             $cardDetails = new CardDetails;
 
             if (!empty($request['paymentResult']['cardDetails']['bin'])) {
-                $cardDetails->setBin($request['paymentResult']['cardDetails']['bin']);
+                $cardDetails->setBin((int) $request['paymentResult']['cardDetails']['bin']);
             }
 
             if (!empty($request['paymentResult']['cardDetails']['owner'])) {
@@ -213,7 +213,7 @@ public function catchJsonRequest(): self
     /** @inheritDoc */
     public function getPaymentResult(): PaymentResultInterface
     {
-        return $this->paymentResult;
+        return $this->paymentResult ?? new PaymentResult();
     }
 
     /** @inheritDoc */
@@ -226,7 +226,7 @@ public function setPaymentResult(PaymentResultInterface $paymentResult): self
     /** @inheritDoc */
     public function getOrderData(): OrderDataInterface
     {
-        return $this->orderData;
+        return $this->orderData ?? new OrderData();
     }
 
     /** @inheritDoc */
@@ -246,6 +246,6 @@ public function setAuthorization(WebhookAuthorizationInterface $authorization):
     /** @inheritDoc */
     public function getAuthorization(): WebhookAuthorizationInterface
     {
-        return $this->authorization;
+        return $this->authorization ?? new WebhookAuthorization();
     }
 }
diff --git a/src/WebhookAuthorization.php b/src/WebhookAuthorization.php
@@ -16,6 +16,6 @@ public function setStoredCredentials(WebhookStoredCredentialsInterface $storedCr
     /** @inheritDoc */
     public function getStoredCredentials(): WebhookStoredCredentialsInterface
     {
-        return $this->storedCredentials;
+        return $this->storedCredentials ?? new WebhookStoredCredentials();
     }
 }
diff --git a/src/WebhookStoredCredentials.php b/src/WebhookStoredCredentials.php
@@ -13,9 +13,9 @@ public function setYpmnBindingId(string $ypmnBindingId): self
         return $this;
     }
 
-    public function getYpmnBindingId(): string
+    public function getYpmnBindingId(): ?string
     {
-        return $this->ypmnBindingId;
+        return $this->ypmnBindingId ?? null;
     }
 
     public function setUseId(string $useId): self
@@ -24,8 +24,8 @@ public function setUseId(string $useId): self
         return $this;
     }
 
-    public function getUseId(): string
+    public function getUseId(): ?string
     {
-        return $this->useId;
+        return $this->useId ?? null;
     }
 }
diff --git a/src/WebhookStoredCredentialsInterface.php b/src/WebhookStoredCredentialsInterface.php
@@ -13,9 +13,9 @@ public function setYpmnBindingId(string $ypmnBindingId): self;
 
     /**
      * Получить токен подписки SberPay
-     * @return string
+     * @return string|null
      */
-    public function getYpmnBindingId(): string;
+    public function getYpmnBindingId(): ?string;
 
     /**
      * Установить идентификатор первоначальной операции
@@ -26,7 +26,7 @@ public function setUseId(string $useId): self;
 
     /**
      * Получить идентификатор первоначальной операции
-     * @return string
+     * @return string|null
      */
-    public function getUseId(): string;
+    public function getUseId(): ?string;
 }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function setNumber(string $number): self`
`55`	`55`	`/** @inheritDoc */`
`56`	`56`	`public function getExpiryMonth(): ?int`
`57`	`57`	`{`
`58`		`- return $this->expiryMonth;`
	`58`	`+ return $this->expiryMonth ?? null;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/** @inheritDoc */`
`@@ -68,7 +68,7 @@ public function setExpiryMonth(int $expiryMonth): self`
`68`	`68`	`/** @inheritDoc */`
`69`	`69`	`public function getYear(): ?int`
`70`	`70`	`{`
`71`		`- return $this->year;`
	`71`	`+ return $this->year ?? null;`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/** @inheritDoc */`
`@@ -85,7 +85,7 @@ public function setYear(int $year): self`
`85`	`85`	`/** @inheritDoc */`
`86`	`86`	`public function getExpiryYear(): ?int`
`87`	`87`	`{`
`88`		`- return $this->expiryYear;`
	`88`	`+ return $this->expiryYear ?? null;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/** @inheritDoc */`
`@@ -98,7 +98,7 @@ public function setExpiryYear(int $expiryYear): self`
`98`	`98`	`/** @inheritDoc */`
`99`	`99`	`public function getCvv(): ?string`
`100`	`100`	`{`
`101`		`- return $this->cvv;`
	`101`	`+ return $this->cvv ?? null;`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/** @inheritDoc */`
`@@ -111,7 +111,7 @@ public function setCvv(string $cvv): self`
`111`	`111`	`/** @inheritDoc */`
`112`	`112`	`public function getOwner(): ?string`
`113`	`113`	`{`
`114`		`- return $this->owner;`
	`114`	`+ return $this->owner ?? null;`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`/** @inheritDoc */`
`@@ -124,7 +124,7 @@ public function setOwner(string $owner): self`
`124`	`124`	`/** @inheritDoc */`
`125`	`125`	`public function getTimeSpentTypingNumber(): ?int`
`126`	`126`	`{`
`127`		`- return $this->timeSpentTypingNumber;`
	`127`	`+ return $this->timeSpentTypingNumber ?? null;`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`/** @inheritDoc */`
`@@ -137,7 +137,7 @@ public function setTimeSpentTypingNumber(int $timeSpentTypingNumber): self`
`137`	`137`	`/** @inheritDoc */`
`138`	`138`	`public function getTimeSpentTypingOwner(): ?int`
`139`	`139`	`{`
`140`		`- return $this->timeSpentTypingOwner;`
	`140`	`+ return $this->timeSpentTypingOwner ?? null;`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`/** @inheritDoc */`
`@@ -150,7 +150,7 @@ public function setTimeSpentTypingOwner(int $timeSpentTypingOwner): self`
`150`	`150`	`/** @inheritDoc */`
`151`	`151`	`public function getBin(): ?int`
`152`	`152`	`{`
`153`		`- return $this->bin;`
	`153`	`+ return $this->bin ?? null;`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`/** @inheritDoc */`
`@@ -163,7 +163,7 @@ public function setBin(int $bin): self`
`163`	`163`	`/** @inheritDoc */`
`164`	`164`	`public function getPan(): ?string`
`165`	`165`	`{`
`166`		`- return $this->pan;`
	`166`	`+ return $this->pan ?? null;`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/** @inheritDoc */`
`@@ -176,7 +176,7 @@ public function setPan(string $pan): self`
`176`	`176`	`/** @inheritDoc */`
`177`	`177`	`public function getType(): ?string`
`178`	`178`	`{`
`179`		`- return $this->type;`
	`179`	`+ return $this->type ?? null;`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`/** @inheritDoc */`
`@@ -189,7 +189,7 @@ public function setType(string $type): self`
`189`	`189`	`/** @inheritDoc */`
`190`	`190`	`public function getCardIssuerBank(): ?string`
`191`	`191`	`{`
`192`		`- return $this->cardIssuerBank;`
	`192`	`+ return $this->cardIssuerBank ?? null;`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`/** @inheritDoc */`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class OrderData implements OrderDataInterface`
`37`	`37`	`/** @inheritDoc */`
`38`	`38`	`public function getOrderDate(): ?string`
`39`	`39`	`{`
`40`		`- return $this->orderDate;`
	`40`	`+ return $this->orderDate ?? null;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/** @inheritDoc */`
`@@ -59,7 +59,7 @@ public function setYpmnPaymentReference(string $ypmnPaymentReference): self`
`59`	`59`	`/** @inheritDoc */`
`60`	`60`	`public function getYpmnPaymentReference(): ?string`
`61`	`61`	`{`
`62`		`- return $this->payUPaymentReference;`
	`62`	`+ return $this->payUPaymentReference ?? null;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/** @inheritDoc */`
`@@ -73,13 +73,13 @@ public function setPayUPaymentReference(string $payUPaymentReference): self`
`73`	`73`	`/** @inheritDoc */`
`74`	`74`	`public function getPayUPaymentReference(): ?string`
`75`	`75`	`{`
`76`		`- return $this->payUPaymentReference;`
	`76`	`+ return $this->payUPaymentReference ?? null;`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/** @inheritDoc */`
`80`	`80`	`public function getMerchantPaymentReference(): ?string`
`81`	`81`	`{`
`82`		`- return $this->merchantPaymentReference;`
	`82`	`+ return $this->merchantPaymentReference ?? null;`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`/** @inheritDoc */`
`@@ -93,7 +93,7 @@ public function setMerchantPaymentReference(string $merchantPaymentReference): s`
`93`	`93`	`/** @inheritDoc */`
`94`	`94`	`public function getStatus(): ?string`
`95`	`95`	`{`
`96`		`- return $this->status;`
	`96`	`+ return $this->status ?? null;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`/** @inheritDoc */`
`@@ -107,7 +107,7 @@ public function setStatus(string $status): self`
`107`	`107`	`/** @inheritDoc */`
`108`	`108`	`public function getCurrency(): ?string`
`109`	`109`	`{`
`110`		`- return $this->currency;`
	`110`	`+ return $this->currency ?? null;`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`/** @inheritDoc */`
`@@ -121,7 +121,7 @@ public function setCurrency(string $currency): self`
`121`	`121`	`/** @inheritDoc */`
`122`	`122`	`public function getAmount(): ?float`
`123`	`123`	`{`
`124`		`- return $this->amount;`
	`124`	`+ return $this->amount ?? null;`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`/** @inheritDoc */`
`@@ -135,7 +135,7 @@ public function setAmount(float $amount): self`
`135`	`135`	`/** @inheritDoc */`
`136`	`136`	`public function getCommission(): ?float`
`137`	`137`	`{`
`138`		`- return $this->commission;`
	`138`	`+ return $this->commission ?? null;`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`/** @inheritDoc */`
`@@ -151,7 +151,7 @@ public function setCommission(float $commission): self`
`151`	`151`	`/** @inheritDoc */`
`152`	`152`	`public function getRefundRequestId(): ?string`
`153`	`153`	`{`
`154`		`- return $this->refundRequestId;`
	`154`	`+ return $this->refundRequestId ?? null;`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`/** @inheritDoc */`
`@@ -164,7 +164,7 @@ public function setRefundRequestId(string $refundRequestId): self`
`164`	`164`	`/** @inheritDoc */`
`165`	`165`	`public function getLoyaltyPointsAmount(): ?int`
`166`	`166`	`{`
`167`		`- return $this->loyaltyPointsAmount;`
	`167`	`+ return $this->loyaltyPointsAmount ?? null;`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`/** @inheritDoc */`
`@@ -178,7 +178,7 @@ public function setLoyaltyPointsAmount(int $loyaltyPointsAmount): self`
`178`	`178`	`/** @inheritDoc */`
`179`	`179`	`public function getLoyaltyPointsDetails(): ?array`
`180`	`180`	`{`
`181`		`- return $this->loyaltyPointsDetails;`
	`181`	`+ return $this->loyaltyPointsDetails ?? null;`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`/** @inheritDoc */`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class PaymentResult implements PaymentResultInterface`
`43`	`43`	`/** @inheritDoc */`
`44`	`44`	`public function getPaymentMethod(): ?string`
`45`	`45`	`{`
`46`		`- return $this->paymentMethod;`
	`46`	`+ return $this->paymentMethod ?? null;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/** @inheritDoc */`
`@@ -56,7 +56,7 @@ public function setPaymentMethod(string $paymentMethod): self`
`56`	`56`	`/** @inheritDoc */`
`57`	`57`	`public function getPaymentDate(): ?string`
`58`	`58`	`{`
`59`		`- return $this->paymentDate;`
	`59`	`+ return $this->paymentDate ?? null;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/** @inheritDoc */`
`@@ -69,7 +69,7 @@ public function setPaymentDate(string $paymentDate): self`
`69`	`69`	`/** @inheritDoc */`
`70`	`70`	`public function getCaptureDate(): ?string`
`71`	`71`	`{`
`72`		`- return $this->captureDate;`
	`72`	`+ return $this->captureDate ?? null;`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/** @inheritDoc */`
`@@ -82,7 +82,7 @@ public function setCaptureDate(string $captureDate): self`
`82`	`82`	`/** @inheritDoc */`
`83`	`83`	`public function getCardProgramName(): ?string`
`84`	`84`	`{`
`85`		`- return $this->cardProgramName;`
	`85`	`+ return $this->cardProgramName ?? null;`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/** @inheritDoc */`
`@@ -95,7 +95,7 @@ public function setCardProgramName(string $cardProgramName): self`
`95`	`95`	`/** @inheritDoc */`
`96`	`96`	`public function getAuthCode(): ?string`
`97`	`97`	`{`
`98`		`- return $this->authCode;`
	`98`	`+ return $this->authCode ?? null;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`/** @inheritDoc */`
`@@ -108,7 +108,7 @@ public function setAuthCode(string $authCode): self`
`108`	`108`	`/** @inheritDoc */`
`109`	`109`	`public function getMerchantId(): ?string`
`110`	`110`	`{`
`111`		`- return $this->merchantId;`
	`111`	`+ return $this->merchantId ?? null;`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`/** @inheritDoc */`
`@@ -121,7 +121,7 @@ public function setMerchantId(string $merchantId): self`
`121`	`121`	`/** @inheritDoc */`
`122`	`122`	`public function getRrn(): ?int`
`123`	`123`	`{`
`124`		`- return $this->rrn;`
	`124`	`+ return $this->rrn ?? null;`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`/** @inheritDoc */`
`@@ -134,7 +134,7 @@ public function setRrn(int $rrn): self`
`134`	`134`	`/** @inheritDoc */`
`135`	`135`	`public function getInstallmentsNumber(): ?string`
`136`	`136`	`{`
`137`		`- return $this->installmentsNumber;`
	`137`	`+ return $this->installmentsNumber ?? null;`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`/** @inheritDoc */`
`@@ -154,13 +154,13 @@ public function setCardDetails(CardDetailsInterface $cardDetails): self`
`154`	`154`	`/** @inheritDoc */`
`155`	`155`	`public function getCardDetails() : CardDetailsInterface`
`156`	`156`	`{`
`157`		`- return $this->cardDetails;`
	`157`	`+ return $this->cardDetails ?? new CardDetails();`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`/** @inheritDoc */`
`161`	`161`	`public function getPaymentBankShortName(): ?string`
`162`	`162`	`{`
`163`		`- return $this->paymentBankShortName;`
	`163`	`+ return $this->paymentBankShortName ?? null;`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`/** @inheritDoc */`
`@@ -173,7 +173,7 @@ public function setPaymentBankShortName(string $paymentBankShortName): self`
`173`	`173`	`/** @inheritDoc */`
`174`	`174`	`public function getServiceProcessingType(): ?string`
`175`	`175`	`{`
`176`		`- return $this->serviceProcessingType;`
	`176`	`+ return $this->serviceProcessingType ?? null;`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`/** @inheritDoc */`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function catchJsonRequest(): self`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if (!empty($request['orderData']['amount'])) {`
`53`		`- $this->orderData->setAmount($request['orderData']['amount']);`
	`53`	`+ $this->orderData->setAmount((float) $request['orderData']['amount']);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if (isset($request['orderData']['commission'])) {`
`@@ -69,7 +69,7 @@ public function catchJsonRequest(): self`
`69`	`69`	`$cardDetails = new CardDetails;`
`70`	`70`
`71`	`71`	`if (!empty($request['paymentResult']['cardDetails']['bin'])) {`
`72`		`- $cardDetails->setBin($request['paymentResult']['cardDetails']['bin']);`
	`72`	`+ $cardDetails->setBin((int) $request['paymentResult']['cardDetails']['bin']);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if (!empty($request['paymentResult']['cardDetails']['owner'])) {`
`@@ -213,7 +213,7 @@ public function catchJsonRequest(): self`
`213`	`213`	`/** @inheritDoc */`
`214`	`214`	`public function getPaymentResult(): PaymentResultInterface`
`215`	`215`	`{`
`216`		`- return $this->paymentResult;`
	`216`	`+ return $this->paymentResult ?? new PaymentResult();`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`/** @inheritDoc */`
`@@ -226,7 +226,7 @@ public function setPaymentResult(PaymentResultInterface $paymentResult): self`
`226`	`226`	`/** @inheritDoc */`
`227`	`227`	`public function getOrderData(): OrderDataInterface`
`228`	`228`	`{`
`229`		`- return $this->orderData;`
	`229`	`+ return $this->orderData ?? new OrderData();`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`/** @inheritDoc */`
`@@ -246,6 +246,6 @@ public function setAuthorization(WebhookAuthorizationInterface $authorization):`
`246`	`246`	`/** @inheritDoc */`
`247`	`247`	`public function getAuthorization(): WebhookAuthorizationInterface`
`248`	`248`	`{`
`249`		`- return $this->authorization;`
	`249`	`+ return $this->authorization ?? new WebhookAuthorization();`
`250`	`250`	`}`
`251`	`251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ public function setStoredCredentials(WebhookStoredCredentialsInterface $storedCr`
`16`	`16`	`/** @inheritDoc */`
`17`	`17`	`public function getStoredCredentials(): WebhookStoredCredentialsInterface`
`18`	`18`	`{`
`19`		`- return $this->storedCredentials;`
	`19`	`+ return $this->storedCredentials ?? new WebhookStoredCredentials();`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ public function setYpmnBindingId(string $ypmnBindingId): self`
`13`	`13`	`return $this;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public function getYpmnBindingId(): string`
	`16`	`+ public function getYpmnBindingId(): ?string`
`17`	`17`	`{`
`18`		`- return $this->ypmnBindingId;`
	`18`	`+ return $this->ypmnBindingId ?? null;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public function setUseId(string $useId): self`
`@@ -24,8 +24,8 @@ public function setUseId(string $useId): self`
`24`	`24`	`return $this;`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function getUseId(): string`
	`27`	`+ public function getUseId(): ?string`
`28`	`28`	`{`
`29`		`- return $this->useId;`
	`29`	`+ return $this->useId ?? null;`
`30`	`30`	`}`
`31`	`31`	`}`