chore: update SDK from api-definitions (#728)

Co-authored-by: rebilly-machine-user <[email protected]>
Rebilly · Nov 23, 2024 · db1c395 · db1c395
1 parent fff8528
commit db1c395
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 38 deletions.
diff --git a/.changeset/afraid-dodos-grab.md b/.changeset/afraid-dodos-grab.md
@@ -0,0 +1,5 @@
+---
+"@rebilly/client-php": patch
+---
+
+fix(api-definitions): Fix some of the inconsistencies of Plan API-defs Rebilly/rebilly#8670
diff --git a/src/Model/ConfigurablePlan.php b/src/Model/ConfigurablePlan.php
@@ -18,6 +18,4 @@
 interface ConfigurablePlan extends JsonSerializable
 {
     public function getId(): ?string;
-
-    public function setId(string $id): static;
 }
diff --git a/src/Model/FlexiblePlan.php b/src/Model/FlexiblePlan.php
@@ -19,8 +19,6 @@ interface FlexiblePlan extends ConfigurablePlan
 {
     public function getId(): ?string;
 
-    public function setId(null|string $id): static;
-
     public function getName(): string;
 
     public function setName(string $name): static;

diff --git a/src/Model/OneTimeSalePlan.php b/src/Model/OneTimeSalePlan.php
@@ -85,13 +85,6 @@ public function getId(): ?string
         return $this->fields['id'] ?? null;
     }
 
-    public function setId(null|string $id): static
-    {
-        $this->fields['id'] = $id;
-
-        return $this;
-    }
-
     public function getName(): string
     {
         return $this->fields['name'];
@@ -322,6 +315,13 @@ public function jsonSerialize(): array
         return $data;
     }
 
+    private function setId(null|string $id): static
+    {
+        $this->fields['id'] = $id;
+
+        return $this;
+    }
+
     private function setCurrencySign(null|string $currencySign): static
     {
         $this->fields['currencySign'] = $currencySign;

diff --git a/src/Model/Plan.php b/src/Model/Plan.php
@@ -20,8 +20,6 @@ interface Plan extends JsonSerializable
 {
     public function getId(): ?string;
 
-    public function setId(null|string $id): static;
-
     public function getName(): string;
 
     public function setName(string $name): static;

diff --git a/src/Model/SubscriptionPlan.php b/src/Model/SubscriptionPlan.php
@@ -97,13 +97,6 @@ public function getId(): ?string
         return $this->fields['id'] ?? null;
     }
 
-    public function setId(null|string $id): static
-    {
-        $this->fields['id'] = $id;
-
-        return $this;
-    }
-
     public function getName(): string
     {
         return $this->fields['name'];
@@ -253,14 +246,14 @@ public function getIsTrialOnly(): ?bool
         return $this->fields['isTrialOnly'] ?? null;
     }
 
-    public function getRecurringInterval(): SubscriptionPlanRecurringInterval
+    public function getRecurringInterval(): ?SubscriptionPlanRecurringInterval
     {
-        return $this->fields['recurringInterval'];
+        return $this->fields['recurringInterval'] ?? null;
     }
 
-    public function setRecurringInterval(SubscriptionPlanRecurringInterval|array $recurringInterval): static
+    public function setRecurringInterval(null|SubscriptionPlanRecurringInterval|array $recurringInterval): static
     {
-        if (!($recurringInterval instanceof SubscriptionPlanRecurringInterval)) {
+        if ($recurringInterval !== null && !($recurringInterval instanceof SubscriptionPlanRecurringInterval)) {
             $recurringInterval = SubscriptionPlanRecurringInterval::from($recurringInterval);
         }
 
@@ -381,7 +374,7 @@ public function jsonSerialize(): array
             $data['isTrialOnly'] = $this->fields['isTrialOnly'];
         }
         if (array_key_exists('recurringInterval', $this->fields)) {
-            $data['recurringInterval'] = $this->fields['recurringInterval']->jsonSerialize();
+            $data['recurringInterval'] = $this->fields['recurringInterval']?->jsonSerialize();
         }
         if (array_key_exists('trial', $this->fields)) {
             $data['trial'] = $this->fields['trial']?->jsonSerialize();
@@ -410,6 +403,13 @@ public function jsonSerialize(): array
         return $data;
     }
 
+    private function setId(null|string $id): static
+    {
+        $this->fields['id'] = $id;
+
+        return $this;
+    }
+
     private function setCurrencySign(null|string $currencySign): static
     {
         $this->fields['currencySign'] = $currencySign;

diff --git a/src/Model/SubscriptionPlanRecurringInterval.php b/src/Model/SubscriptionPlanRecurringInterval.php
@@ -71,24 +71,24 @@ public function setPeriodAnchorInstruction(null|ServicePeriodAnchorInstruction|a
         return $this;
     }
 
-    public function getUnit(): ?string
+    public function getUnit(): string
     {
-        return $this->fields['unit'] ?? null;
+        return $this->fields['unit'];
     }
 
-    public function setUnit(null|string $unit): static
+    public function setUnit(string $unit): static
     {
         $this->fields['unit'] = $unit;
 
         return $this;
     }
 
-    public function getLength(): ?int
+    public function getLength(): int
     {
-        return $this->fields['length'] ?? null;
+        return $this->fields['length'];
     }
 
-    public function setLength(null|int $length): static
+    public function setLength(int $length): static
     {
         $this->fields['length'] = $length;
 

diff --git a/src/Model/TrialOnlyPlan.php b/src/Model/TrialOnlyPlan.php
@@ -88,13 +88,6 @@ public function getId(): ?string
         return $this->fields['id'] ?? null;
     }
 
-    public function setId(null|string $id): static
-    {
-        $this->fields['id'] = $id;
-
-        return $this;
-    }
-
     public function getName(): string
     {
         return $this->fields['name'];
@@ -344,6 +337,13 @@ public function jsonSerialize(): array
         return $data;
     }
 
+    private function setId(null|string $id): static
+    {
+        $this->fields['id'] = $id;
+
+        return $this;
+    }
+
     private function setCurrencySign(null|string $currencySign): static
     {
         $this->fields['currencySign'] = $currencySign;