NTR - Replaced Uuid Generator with doctrines

shopware · Oct 7, 2024 · 098fa8b · 098fa8b
1 parent 6e89b09
commit 098fa8b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 135 deletions.
diff --git a/src/Doctrine/RespectfulUuidGenerator.php b/src/Doctrine/RespectfulUuidGenerator.php
diff --git a/src/Entity/Contract/EntityIdTrait.php b/src/Entity/Contract/EntityIdTrait.php
@@ -3,7 +3,6 @@
 namespace Swag\Braintree\Entity\Contract;
 
 use Doctrine\ORM\Mapping as ORM;
-use Swag\Braintree\Doctrine\RespectfulUuidGenerator;
 use Symfony\Component\Uid\Uuid;
 
 #[ORM\MappedSuperclass]
@@ -12,17 +11,17 @@ trait EntityIdTrait
     #[ORM\Id]
     #[ORM\Column(type: 'uuid', unique: true)]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: RespectfulUuidGenerator::class)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     // will never be null in the database
     // null only signalizes the uuid-generator to generate a new uuid for the database
-    private ?Uuid $id = null;
+    private Uuid $id;
 
     public function getId(): ?Uuid
     {
-        return $this->id;
+        return $this->id ?? null;
     }
 
-    public function setId(?Uuid $id): self
+    public function setId(Uuid $id): self
     {
         $this->id = $id;
 

diff --git a/src/Entity/Contract/EntityInterface.php b/src/Entity/Contract/EntityInterface.php
@@ -8,7 +8,7 @@ interface EntityInterface
 {
     public function getId(): ?Uuid;
 
-    public function setId(?Uuid $id): self;
+    public function setId(Uuid $id): self;
 
     public function getCreatedAt(): \DateTimeInterface;
 

diff --git a/tests/unit/Doctrine/RespectfulUuidGeneratorTest.php b/tests/unit/Doctrine/RespectfulUuidGeneratorTest.php