Make entities extendable

Sylius · Feb 8, 2019 · b1f716e · b1f716e
1 parent 04e4db9
commit b1f716e
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 53 deletions.
diff --git a/src/Entity/BillingData.php b/src/Entity/BillingData.php
@@ -10,34 +10,34 @@
 class BillingData implements BillingDataInterface, ResourceInterface
 {
     /** @var int */
-    private $id;
+    protected $id;
 
     /** @var string */
-    private $firstName;
+    protected $firstName;
 
     /** @var string */
-    private $lastName;
+    protected $lastName;
 
     /** @var string|null */
-    private $company;
+    protected $company;
 
     /** @var string */
-    private $countryCode;
+    protected $countryCode;
 
     /** @var string|null */
-    private $provinceCode;
+    protected $provinceCode;
 
     /** @var string|null */
-    private $provinceName;
+    protected $provinceName;
 
     /** @var string */
-    private $street;
+    protected $street;
 
     /** @var string */
-    private $city;
+    protected $city;
 
     /** @var string */
-    private $postcode;
+    protected $postcode;
 
     public function __construct(
         string $firstName,

diff --git a/src/Entity/Invoice.php b/src/Entity/Invoice.php
@@ -11,40 +11,40 @@
 class Invoice implements InvoiceInterface, ResourceInterface
 {
     /** @var string */
-    private $id;
+    protected $id;
 
     /** @var string */
-    private $number;
+    protected $number;
 
     /** @var string */
-    private $orderNumber;
+    protected $orderNumber;
 
     /** @var \DateTimeInterface */
-    private $issuedAt;
+    protected $issuedAt;
 
     /** @var BillingDataInterface */
-    private $billingData;
+    protected $billingData;
 
     /** @var string */
-    private $currencyCode;
+    protected $currencyCode;
 
     /** @var string */
-    private $localeCode;
+    protected $localeCode;
 
     /** @var int */
-    private $total;
+    protected $total;
 
     /** @var Collection|LineItemInterface[] */
-    private $lineItems;
+    protected $lineItems;
 
     /** @var Collection|TaxItemInterface[] */
-    private $taxItems;
+    protected $taxItems;
 
     /** @var InvoiceChannelInterface */
-    private $channel;
+    protected $channel;
 
     /** @var InvoiceShopBillingDataInterface */
-    private $shopBillingData;
+    protected $shopBillingData;
 
     public function __construct(
         string $id,

diff --git a/src/Entity/InvoiceChannel.php b/src/Entity/InvoiceChannel.php
@@ -8,10 +8,10 @@
 class InvoiceChannel implements InvoiceChannelInterface
 {
     /** @var string */
-    private $code;
+    protected $code;
 
     /** @var string */
-    private $name;
+    protected $name;
 
     public function __construct(string $code, string $name)
     {

diff --git a/src/Entity/InvoiceShopBillingData.php b/src/Entity/InvoiceShopBillingData.php
@@ -4,25 +4,26 @@
 
 namespace Sylius\InvoicingPlugin\Entity;
 
-final class InvoiceShopBillingData implements InvoiceShopBillingDataInterface
+/** @final */
+class InvoiceShopBillingData implements InvoiceShopBillingDataInterface
 {
     /** @var string|null */
-    private $company;
+    protected $company;
 
     /** @var string|null */
-    private $taxId;
+    protected $taxId;
 
     /** @var string|null */
-    private $countryCode;
+    protected $countryCode;
 
     /** @var string|null */
-    private $street;
+    protected $street;
 
     /** @var string|null */
-    private $city;
+    protected $city;
 
     /** @var string|null */
-    private $postcode;
+    protected $postcode;
 
     public function getCompany(): ?string
     {

diff --git a/src/Entity/LineItem.php b/src/Entity/LineItem.php
@@ -10,34 +10,34 @@
 class LineItem implements LineItemInterface, ResourceInterface
 {
     /** @var string */
-    private $id;
+    protected $id;
 
     /** @var InvoiceInterface */
-    private $invoice;
+    protected $invoice;
 
     /** @var string */
-    private $name;
+    protected $name;
 
     /** @var string|null */
-    private $variantName;
+    protected $variantName;
 
     /** @var string|null */
-    private $variantCode;
+    protected $variantCode;
 
     /** @var int */
-    private $quantity;
+    protected $quantity;
 
     /** @var int */
-    private $unitPrice;
+    protected $unitPrice;
 
     /** @var int */
-    private $subtotal;
+    protected $subtotal;
 
     /** @var int */
-    private $taxTotal;
+    protected $taxTotal;
 
     /** @var int */
-    private $total;
+    protected $total;
 
     public function __construct(
         string $name,

diff --git a/src/Entity/TaxItem.php b/src/Entity/TaxItem.php
@@ -10,16 +10,16 @@
 class TaxItem implements TaxItemInterface, ResourceInterface
 {
     /** @var string */
-    private $id;
+    protected $id;
 
     /** @var InvoiceInterface */
-    private $invoice;
+    protected $invoice;
 
     /** @var string */
-    private $label;
+    protected $label;
 
     /** @var int */
-    private $amount;
+    protected $amount;
 
     public function __construct(string $label, int $amount)
     {

diff --git a/src/Resources/config/doctrine/BillingData.orm.xml b/src/Resources/config/doctrine/BillingData.orm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Sylius\InvoicingPlugin\Entity\BillingData" table="sylius_invoicing_plugin_billing_data">
+    <mapped-superclass name="Sylius\InvoicingPlugin\Entity\BillingData" table="sylius_invoicing_plugin_billing_data">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>
@@ -15,5 +15,5 @@
         <field name="countryCode" column="country_code" />
         <field name="provinceCode" column="province_code" nullable="true" />
         <field name="provinceName" column="province_name" nullable="true" />
-    </entity>
+    </mapped-superclass>
 </doctrine-mapping>
diff --git a/src/Resources/config/doctrine/Invoice.orm.xml b/src/Resources/config/doctrine/Invoice.orm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Sylius\InvoicingPlugin\Entity\Invoice" table="sylius_invoicing_plugin_invoice">
+    <mapped-superclass name="Sylius\InvoicingPlugin\Entity\Invoice" table="sylius_invoicing_plugin_invoice">
         <id name="id" column="id" type="string" />
 
         <field name="number" column="number" />
@@ -37,5 +37,5 @@
         <indexes>
             <index columns="order_number" />
         </indexes>
-    </entity>
+    </mapped-superclass>
 </doctrine-mapping>
diff --git a/src/Resources/config/doctrine/LineItem.orm.xml b/src/Resources/config/doctrine/LineItem.orm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Sylius\InvoicingPlugin\Entity\LineItem" table="sylius_invoicing_plugin_line_item">
+    <mapped-superclass name="Sylius\InvoicingPlugin\Entity\LineItem" table="sylius_invoicing_plugin_line_item">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>
@@ -18,5 +18,5 @@
         <many-to-one field="invoice" target-entity="Sylius\InvoicingPlugin\Entity\InvoiceInterface" inversed-by="lineItems">
             <join-column name="invoice_id" nullable="false" on-delete="CASCADE" />
         </many-to-one>
-    </entity>
+    </mapped-superclass>
 </doctrine-mapping>
diff --git a/src/Resources/config/doctrine/TaxItem.orm.xml b/src/Resources/config/doctrine/TaxItem.orm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Sylius\InvoicingPlugin\Entity\TaxItem" table="sylius_invoicing_plugin_tax_item">
+    <mapped-superclass name="Sylius\InvoicingPlugin\Entity\TaxItem" table="sylius_invoicing_plugin_tax_item">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>
@@ -12,5 +12,5 @@
         <many-to-one field="invoice" target-entity="Sylius\InvoicingPlugin\Entity\InvoiceInterface" inversed-by="taxItems">
             <join-column name="invoice_id" nullable="false" on-delete="CASCADE" />
         </many-to-one>
-    </entity>
+    </mapped-superclass>
 </doctrine-mapping>