fix: webhook data nullable

johnkhansrc · Mar 8, 2022 · 8e1ebee · 8e1ebee
1 parent 13b1b13
commit 8e1ebee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/Factory/WebhookFactory.php b/src/Factory/WebhookFactory.php
@@ -97,8 +97,8 @@ private static function instanciateWebhookData(array $dataPayload): WebhookData
                 new DateTime($dataPayload['expirationDate']),
                 isset($dataPayload['autoResumeDate']) ? new DateTime($dataPayload['autoResumeDate']) : null,
                 $dataPayload['nextPurchase'] ?? null,
-                $dataPayload['linkedPurchase'],
-                $dataPayload['originalPurchase']
+                $dataPayload['linkedPurchase'] ?? null,
+                $dataPayload['originalPurchase'] ?? null
             ) : null,
         );
     }

diff --git a/src/Model/Webhook/SubscriptionData.php b/src/Model/Webhook/SubscriptionData.php
@@ -104,11 +104,11 @@ class SubscriptionData
     /**
      * Previous purchase id of a renewable subscription.
      */
-    private string $linkedPurchase;
+    private ?string $linkedPurchase;
     /**
      * Original purchase id of a renewable subscription.
      */
-    private string $originalPurchase;
+    private ?string $originalPurchase;
 
     public function __construct(
         bool $isSubscriptionActive,
@@ -125,8 +125,8 @@ public function __construct(
         DateTime $expirationDate,
         ?DateTime $autoResumeDate,
         ?string $nextPurchase,
-        string $linkedPurchase,
-        string $originalPurchase
+        ?string $linkedPurchase,
+        ?string $originalPurchase
     )
     {
         $this->isSubscriptionActive = $isSubscriptionActive;
@@ -400,36 +400,36 @@ public function setNextPurchase(?string $nextPurchase): SubscriptionData
     }
 
     /**
-     * @return string
+     * @return null|string
      */
-    public function getLinkedPurchase(): string
+    public function getLinkedPurchase(): ?string
     {
         return $this->linkedPurchase;
     }
 
     /**
-     * @param string $linkedPurchase
+     * @param null|string $linkedPurchase
      * @return SubscriptionData
      */
-    public function setLinkedPurchase(string $linkedPurchase): SubscriptionData
+    public function setLinkedPurchase(?string $linkedPurchase): SubscriptionData
     {
         $this->linkedPurchase = $linkedPurchase;
         return $this;
     }
 
     /**
-     * @return string
+     * @return null|string
      */
-    public function getOriginalPurchase(): string
+    public function getOriginalPurchase(): ?string
     {
         return $this->originalPurchase;
     }
 
     /**
-     * @param string $originalPurchase
+     * @param null|string $originalPurchase
      * @return SubscriptionData
      */
-    public function setOriginalPurchase(string $originalPurchase): SubscriptionData
+    public function setOriginalPurchase(?string $originalPurchase): SubscriptionData
     {
         $this->originalPurchase = $originalPurchase;
         return $this;