[make:entity] Improve uid support (#1139)

symfony · Jul 5, 2022 · b23178c · b23178c
1 parent 5d517da
commit b23178c
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 1 deletion.
diff --git a/src/Maker/MakeEntity.php b/src/Maker/MakeEntity.php
@@ -374,7 +374,7 @@ private function askForNextField(ConsoleStyle $io, array $fields, string $entity
         } elseif (str_starts_with($snakeCasedField, 'has_')) {
             $defaultType = 'boolean';
         } elseif ('uuid' === $snakeCasedField) {
-            $defaultType = 'uuid';
+            $defaultType = Type::hasType('uuid') ? 'uuid' : 'guid';
         } elseif ('guid' === $snakeCasedField) {
             $defaultType = 'guid';
         }

diff --git a/src/Util/ClassSourceManipulator.php b/src/Util/ClassSourceManipulator.php
@@ -35,6 +35,8 @@
 use Symfony\Bundle\MakerBundle\Doctrine\RelationOneToMany;
 use Symfony\Bundle\MakerBundle\Doctrine\RelationOneToOne;
 use Symfony\Bundle\MakerBundle\Str;
+use Symfony\Component\Uid\Ulid;
+use Symfony\Component\Uid\Uuid;
 
 /**
  * @internal
@@ -94,6 +96,8 @@ public function addEntityField(string $propertyName, array $columnOptions, array
         $defaultValue = null;
         if ('array' === $typeHint) {
             $defaultValue = new Node\Expr\Array_([], ['kind' => Node\Expr\Array_::KIND_SHORT]);
+        } elseif ('\\' === $typeHint[0] && false !== strpos($typeHint, '\\', 1)) {
+            $typeHint = $this->addUseStatementIfNecessary(substr($typeHint, 1));
         }
 
         $this->addProperty(
@@ -1030,6 +1034,8 @@ private function getEntityTypeHint(string $doctrineType): ?string
             'datetime_immutable', 'datetimetz_immutable', 'date_immutable', 'time_immutable' => '\\'.\DateTimeImmutable::class,
             'dateinterval' => '\\'.\DateInterval::class,
             'object' => 'object',
+            'uuid' => '\\'.Uuid::class,
+            'ulid' => '\\'.Ulid::class,
             default => null,
         };
     }

diff --git a/tests/Util/ClassSourceManipulatorTest.php b/tests/Util/ClassSourceManipulatorTest.php
@@ -279,6 +279,24 @@ public function getAddEntityFieldTests(): \Generator
             ],
             'User_simple_object.php',
         ];
+
+        yield 'entity_add_uuid' => [
+            'User_simple.php',
+            'uuid',
+            [
+                'type' => 'uuid',
+            ],
+            'User_simple_uuid.php',
+        ];
+
+        yield 'entity_add_ulid' => [
+            'User_simple.php',
+            'ulid',
+            [
+                'type' => 'ulid',
+            ],
+            'User_simple_ulid.php',
+        ];
     }
 
     /**

diff --git a/tests/Util/fixtures/add_entity_field/User_simple_ulid.php b/tests/Util/fixtures/add_entity_field/User_simple_ulid.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Uid\Ulid;
+
+#[ORM\Entity]
+class User
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
+    private $id;
+
+    #[ORM\Column(type: 'ulid')]
+    private $ulid;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getUlid(): ?Ulid
+    {
+        return $this->ulid;
+    }
+
+    public function setUlid(Ulid $ulid): self
+    {
+        $this->ulid = $ulid;
+
+        return $this;
+    }
+}
diff --git a/tests/Util/fixtures/add_entity_field/User_simple_uuid.php b/tests/Util/fixtures/add_entity_field/User_simple_uuid.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Uid\Uuid;
+
+#[ORM\Entity]
+class User
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
+    private $id;
+
+    #[ORM\Column(type: 'uuid')]
+    private $uuid;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getUuid(): ?Uuid
+    {
+        return $this->uuid;
+    }
+
+    public function setUuid(Uuid $uuid): self
+    {
+        $this->uuid = $uuid;
+
+        return $this;
+    }
+}