Merge pull request #97 from Ticketpark/i-web-Saferpay-Api-Update-BC

saferpay api update 1.31 => 1.40 – with updates
Ticketpark · Jul 24, 2024 · bc93eca · bc93eca
2 parents ca4f76d + 4b2e80f
commit bc93eca
Show file tree

Hide file tree

Showing 46 changed files with 315 additions and 423 deletions.
diff --git a/example/PaymentPage/example-initialize.php b/example/PaymentPage/example-initialize.php
@@ -28,9 +28,8 @@
 $payment = new Container\Payment($amount);
 $payment->setDescription('Order No. 12839');
 
-$returnUrls = new Container\ReturnUrls(
-    'http://www.mysite.ch/success?orderId=12839',
-    'http://www.mysite.ch/fail'
+$returnUrl = new Container\ReturnUrl(
+    'http://www.mysite.ch/success?orderId=12839'
 );
 
 // -----------------------------
@@ -41,7 +40,7 @@
     $requestConfig,
     $terminalId,
     $payment,
-    $returnUrls
+    $returnUrl
 );
 
 // Note: More data can be provided to InitializeRequest with setters,

diff --git a/example/SecureCardData/example-alias-insert.php b/example/SecureCardData/example-alias-insert.php
@@ -24,9 +24,8 @@
     Container\RegisterAlias::ID_GENERATOR_RANDOM
 );
 
-$returnUrls = new Container\ReturnUrls(
-    'http://www.mysite.ch/success',
-    'http://www.mysite.ch/fail'
+$returnUrl = new Container\ReturnUrl(
+    'http://www.mysite.ch/success'
 );
 
 // -----------------------------
@@ -37,7 +36,7 @@
     $requestConfig,
     $registerAlias,
     AliasInsertRequest::TYPE_CARD,
-    $returnUrls
+    $returnUrl
 );
 
 // -----------------------------

diff --git a/example/Transaction/example-initialize.php b/example/Transaction/example-initialize.php
@@ -28,9 +28,8 @@
 $payment = new Container\Payment($amount);
 $payment->setDescription('Order No. 12840');
 
-$returnUrls = new Container\ReturnUrls(
-    'http://www.mysite.ch/success?orderId=12840',
-    'http://www.mysite.ch/fail'
+$returnUrl = new Container\ReturnUrl(
+    'http://www.mysite.ch/success?orderId=12840'
 );
 
 // -----------------------------
@@ -41,7 +40,7 @@
     $requestConfig,
     $terminalId,
     $payment,
-    $returnUrls
+    $returnUrl
 );
 
 // Note: More data can be provided to InitializeRequest with setters,

diff --git a/lib/SaferpayJson/Request/Container/A2a.php b/lib/SaferpayJson/Request/Container/A2a.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ticketpark\SaferpayJson\Request\Container;
+
+use JMS\Serializer\Annotation\SerializedName;
+
+final class A2a
+{
+    /**
+     * @SerializedName("AccountHolderName")
+     */
+    private string $accountHolderName;
+
+    public function __construct(string $accountHolderName)
+    {
+        $this->accountHolderName = $accountHolderName;
+    }
+
+    public function getAccountHolderName(): string
+    {
+        return $this->accountHolderName;
+    }
+}
diff --git a/lib/SaferpayJson/Request/Container/Address.php b/lib/SaferpayJson/Request/Container/Address.php
@@ -63,11 +63,6 @@ final class Address
      */
     private ?\DateTime $dateOfBirth = null;
 
-    /**
-     * @SerializedName("LegalForm")
-     */
-    private ?string $legalForm = null;
-
     /**
      * @SerializedName("Street2")
      */
@@ -208,18 +203,6 @@ public function setDateOfBirth(?\DateTime $dateOfBirth): self
         return $this;
     }
 
-    public function getLegalForm(): ?string
-    {
-        return $this->legalForm;
-    }
-
-    public function setLegalForm(?string $legalForm): self
-    {
-        $this->legalForm = $legalForm;
-
-        return $this;
-    }
-
     public function getStreet2(): ?string
     {
         return $this->street2;

diff --git a/lib/SaferpayJson/Request/Container/Alipay.php b/lib/SaferpayJson/Request/Container/Alipay.php
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 = [];
@@ -20,6 +20,13 @@ final class Notification
     private ?string $payerEmail = null;
 
     /**
+     * @var string|null
+     * @SerializedName("PayerDccReceiptEmail")
+     */
+    private ?string $payerDccReceiptEmail = null;
+
+    /**
+     * @var string|null
      * @SerializedName("SuccessNotifyUrl")
      */
     private ?string $successNotifyUrl = null;
@@ -53,6 +60,17 @@ public function setPayerEmail(string $payerEmail): self
         return $this;
     }
 
+    public function getPayerDccReceiptEmail(): ?string
+    {
+        return $this->payerDccReceiptEmail;
+    }
+
+    public function setPayerDccReceiptEmail(?string $payerDccReceiptEmail): self
+    {
+        $this->payerDccReceiptEmail = $payerDccReceiptEmail;
+        return $this;
+    }
+
     public function getSuccessNotifyUrl(): ?string
     {
         return $this->successNotifyUrl;

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;