Fix getId/id return type for entities

Sylius · Sep 27, 2021 · a4fbe03 · a4fbe03
1 parent db6c77d
commit a4fbe03
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 18 deletions.
diff --git a/spec/Entity/BillingDataSpec.php b/spec/Entity/BillingDataSpec.php
@@ -34,6 +34,12 @@ function let(): void
         );
     }
 
+    function it_has_no_id_by_default(): void
+    {
+        $this->getId()->shouldReturn(null);
+        $this->id()->shouldReturn(null);
+    }
+
     function it_implements_billing_data_interface(): void
     {
         $this->shouldImplement(BillingDataInterface::class);

diff --git a/spec/Entity/InvoiceShopBillingDataSpec.php b/spec/Entity/InvoiceShopBillingDataSpec.php
@@ -20,6 +20,11 @@ function it_implements_resource_interface(): void
         $this->shouldImplement(ResourceInterface::class);
     }
 
+    function it_has_no_id_by_default(): void
+    {
+        $this->getId()->shouldReturn(null);
+    }
+
     function its_company_is_mutable(): void
     {
         $this->setCompany('Ragnarok');

diff --git a/spec/Entity/LineItemSpec.php b/spec/Entity/LineItemSpec.php
@@ -36,6 +36,12 @@ function let(): void
         );
     }
 
+    function it_has_no_id_by_default(): void
+    {
+        $this->getId()->shouldReturn(null);
+        $this->id()->shouldReturn(null);
+    }
+
     function it_implements_line_item_interface(): void
     {
         $this->shouldImplement(LineItemInterface::class);

diff --git a/spec/Entity/TaxItemSpec.php b/spec/Entity/TaxItemSpec.php
@@ -35,6 +35,12 @@ function it_implements_resource_interface(): void
         $this->shouldImplement(ResourceInterface::class);
     }
 
+    function it_has_no_id_by_default(): void
+    {
+        $this->getId()->shouldReturn(null);
+        $this->id()->shouldReturn(null);
+    }
+
     function it_has_proper_tax_item_data(): void
     {
         $this->label()->shouldReturn('VAT (23%)');

diff --git a/src/Entity/BillingData.php b/src/Entity/BillingData.php
@@ -18,7 +18,7 @@
 /** @final */
 class BillingData implements BillingDataInterface, ResourceInterface
 {
-    protected int $id;
+    protected ?int $id;
 
     protected string $firstName;
 
@@ -60,12 +60,12 @@ public function __construct(
         $this->company = $company;
     }
 
-    public function getId(): int
+    public function getId(): ?int
     {
         return $this->id();
     }
 
-    public function id(): int
+    public function id(): ?int
     {
         return $this->id;
     }

diff --git a/src/Entity/BillingDataInterface.php b/src/Entity/BillingDataInterface.php
@@ -15,7 +15,7 @@
 
 interface BillingDataInterface
 {
-    public function id(): int;
+    public function id(): ?int;
 
     public function firstName(): string;
 

diff --git a/src/Entity/InvoiceShopBillingData.php b/src/Entity/InvoiceShopBillingData.php
@@ -18,8 +18,7 @@
 /** @final */
 class InvoiceShopBillingData implements InvoiceShopBillingDataInterface, ResourceInterface
 {
-    /** @var mixed */
-    protected $id;
+    protected ?int $id;
 
     protected ?string $company = null;
 
@@ -35,7 +34,7 @@ class InvoiceShopBillingData implements InvoiceShopBillingDataInterface, Resourc
 
     protected ?string $representative = null;
 
-    public function getId()
+    public function getId(): ?int
     {
         return $this->id;
     }

diff --git a/src/Entity/InvoiceShopBillingDataInterface.php b/src/Entity/InvoiceShopBillingDataInterface.php
@@ -15,7 +15,7 @@
 
 interface InvoiceShopBillingDataInterface
 {
-    public function getId();
+    public function getId(): ?int;
 
     public function getCompany(): ?string;
 

diff --git a/src/Entity/LineItem.php b/src/Entity/LineItem.php
@@ -19,8 +19,7 @@
 /** @final */
 class LineItem implements LineItemInterface, ResourceInterface
 {
-    /** @var mixed */
-    protected $id;
+    protected ?int $id;
 
     protected InvoiceInterface $invoice;
 
@@ -64,12 +63,12 @@ public function __construct(
         $this->taxRate = $taxRate;
     }
 
-    public function getId()
+    public function getId(): ?int
     {
         return $this->id();
     }
 
-    public function id()
+    public function id(): ?int
     {
         return $this->id;
     }

diff --git a/src/Entity/LineItemInterface.php b/src/Entity/LineItemInterface.php
@@ -15,7 +15,7 @@
 
 interface LineItemInterface
 {
-    public function id();
+    public function id(): ?int;
 
     public function invoice(): InvoiceInterface;
 

diff --git a/src/Entity/TaxItem.php b/src/Entity/TaxItem.php
@@ -18,8 +18,7 @@
 /** @final */
 class TaxItem implements TaxItemInterface, ResourceInterface
 {
-    /** @var mixed */
-    protected $id;
+    protected ?int $id;
 
     protected ?InvoiceInterface $invoice = null;
 
@@ -33,12 +32,12 @@ public function __construct(string $label, int $amount)
         $this->amount = $amount;
     }
 
-    public function getId()
+    public function getId(): ?int
     {
         return $this->id();
     }
 
-    public function id()
+    public function id(): ?int
     {
         return $this->id;
     }

diff --git a/src/Entity/TaxItemInterface.php b/src/Entity/TaxItemInterface.php
@@ -15,7 +15,7 @@
 
 interface TaxItemInterface
 {
-    public function id();
+    public function id(): ?int;
 
     public function invoice(): ?InvoiceInterface;