php attributes for doctrine mappings added

gewebe · May 7, 2024 · a978b6a · a978b6a
1 parent f421390
commit a978b6a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -86,6 +86,8 @@ use Sylius\Component\Core\Model\Address as BaseAddress;
  * @ORM\Entity
  * @ORM\Table(name="sylius_address")
  */
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_address')]
 class Address extends BaseAddress implements VatNumberAddressInterface
 {
     use VatNumberAwareTrait;
@@ -128,6 +130,8 @@ use Sylius\Component\Core\Model\ShopBillingData as BaseShopBillingData;
  * @ORM\Entity
  * @ORM\Table(name="sylius_shop_billing_data")
  */
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_shop_billing_data')]
 class ShopBillingData extends BaseShopBillingData implements ShopBillingDataVatNumberInterface
 {
     use ShopBillingDataVatNumberAwareTrait;

diff --git a/src/Entity/ShopBillingDataVatNumberAwareTrait.php b/src/Entity/ShopBillingDataVatNumberAwareTrait.php
@@ -4,6 +4,7 @@
 
 namespace Gewebe\SyliusVATPlugin\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
@@ -19,6 +20,8 @@ trait ShopBillingDataVatNumberAwareTrait
      *
      * @Groups({"admin:shop_billing_data:read"})
      */
+    #[ORM\Column(name: 'vat_number', type: Types::STRING, nullable: true)]
+    #[Groups(['admin:shop_billing_data:read'])]
     protected ?string $vatNumber = null;
 
     public function getVatNumber(): ?string

diff --git a/src/Entity/VatNumberAwareTrait.php b/src/Entity/VatNumberAwareTrait.php
@@ -5,6 +5,7 @@
 namespace Gewebe\SyliusVATPlugin\Entity;
 
 use DateTime;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Symfony\Component\Serializer\Annotation\Groups;
@@ -23,20 +24,27 @@ trait VatNumberAwareTrait
      *
      * @Groups({"shop:address:read", "shop:address:create", "shop:address:update"})
      */
+    #[ORM\Column(name: 'vat_number', type: Types::STRING, nullable: true)]
+    #[Gedmo\Versioned()]
+    #[Groups(['shop:address:read', 'shop:address:create', 'shop:address:update'])]
     protected ?string $vatNumber = null;
 
     /**
      * @ORM\Column(name="vat_valid", type="boolean")
      *
      * @Groups({"shop:address:read"})
      */
+    #[ORM\Column(name: 'vat_valid', type: Types::BOOLEAN)]
+    #[Groups(['shop:address:read'])]
     protected bool $vatValid = false;
 
     /**
      * @ORM\Column(name="vat_validated_at", type="datetime", nullable=true)
      *
      * @Groups({"shop:address:read"})
      */
+    #[ORM\Column(name: 'vat_validated_at', type: Types::DATETIME_MUTABLE, nullable: true)]
+    #[Groups(['shop:address:read'])]
     protected ?DateTime $vatValidatedAt = null;
 
     public function getVatNumber(): ?string

diff --git a/tests/Application/config/packages/doctrine.yaml b/tests/Application/config/packages/doctrine.yaml
@@ -19,7 +19,7 @@ doctrine:
         mappings:
             App:
                 is_bundle: false
-                type: annotation
+                type: attribute
                 dir: '%kernel.project_dir%/src/Entity'
                 prefix: 'Tests\Gewebe\SyliusVATPlugin\Application\src\Entity'
                 alias: App
diff --git a/tests/Application/src/Entity/Addressing/Address.php b/tests/Application/src/Entity/Addressing/Address.php
@@ -15,6 +15,8 @@
  * @ORM\Entity
  * @ORM\Table(name="sylius_address")
  */
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_address')]
 class Address extends BaseAddress implements VatNumberAddressInterface
 {
     use VatNumberAwareTrait;

diff --git a/tests/Application/src/Entity/Channel/ShopBillingData.php b/tests/Application/src/Entity/Channel/ShopBillingData.php
@@ -15,6 +15,8 @@
  * @ORM\Entity
  * @ORM\Table(name="sylius_shop_billing_data")
  */
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_shop_billing_data')]
 class ShopBillingData extends BaseShopBillingData implements ShopBillingDataVatNumberInterface
 {
     use ShopBillingDataVatNumberAwareTrait;