symfony · fabpot · Oct 6, 2020 · Oct 5, 2020
diff --git a/...fony/Bridge/Doctrine/Id/UlidGenerator.php → ...ge/Doctrine/IdGenerator/UlidGenerator.php b/...fony/Bridge/Doctrine/Id/UlidGenerator.php → ...ge/Doctrine/IdGenerator/UlidGenerator.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bridge\Doctrine\Types;
+namespace Symfony\Bridge\Doctrine\IdGenerator;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Id\AbstractIdGenerator;

diff --git a/...ny/Bridge/Doctrine/Id/UuidV1Generator.php → .../Doctrine/IdGenerator/UuidV1Generator.php b/...ny/Bridge/Doctrine/Id/UuidV1Generator.php → .../Doctrine/IdGenerator/UuidV1Generator.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bridge\Doctrine\Types;
+namespace Symfony\Bridge\Doctrine\IdGenerator;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Id\AbstractIdGenerator;

diff --git a/...ny/Bridge/Doctrine/Id/UuidV4Generator.php → .../Doctrine/IdGenerator/UuidV4Generator.php b/...ny/Bridge/Doctrine/Id/UuidV4Generator.php → .../Doctrine/IdGenerator/UuidV4Generator.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bridge\Doctrine\Types;
+namespace Symfony\Bridge\Doctrine\IdGenerator;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Id\AbstractIdGenerator;

diff --git a/...ny/Bridge/Doctrine/Id/UuidV6Generator.php → .../Doctrine/IdGenerator/UuidV6Generator.php b/...ny/Bridge/Doctrine/Id/UuidV6Generator.php → .../Doctrine/IdGenerator/UuidV6Generator.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bridge\Doctrine\Types;
+namespace Symfony\Bridge\Doctrine\IdGenerator;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Id\AbstractIdGenerator;

diff --git a/src/Symfony/Bridge/Doctrine/Tests/IdGenerator/EntityManager.php b/src/Symfony/Bridge/Doctrine/Tests/IdGenerator/EntityManager.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\IdGenerator;
+
+use Doctrine\ORM\EntityManager as DoctrineEntityManager;
+
+class EntityManager extends DoctrineEntityManager
+{
+    public function __construct()
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/IdGenerator/UlidGeneratorTest.php b/src/Symfony/Bridge/Doctrine/Tests/IdGenerator/UlidGeneratorTest.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\IdGenerator;
+
+use Doctrine\ORM\Mapping\Entity;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Doctrine\IdGenerator\UlidGenerator;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\Ulid;
+
+class UlidGeneratorTest extends TestCase
+{
+    public function testUlidCanBeGenerated()
+    {
+        $em = new EntityManager();
+        $generator = new UlidGenerator();
+        $ulid = $generator->generate($em, new Entity());
+
+        $this->assertInstanceOf(AbstractUid::class, $ulid);
+        $this->assertInstanceOf(Ulid::class, $ulid);
+        $this->assertTrue(Ulid::isValid($ulid));
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/IdGenerator/UuidV1GeneratorTest.php b/src/Symfony/Bridge/Doctrine/Tests/IdGenerator/UuidV1GeneratorTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\IdGenerator;
+
+use Doctrine\ORM\Mapping\Entity;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Doctrine\IdGenerator\UuidV1Generator;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\UuidV1;
+
+class UuidV1GeneratorTest extends TestCase
+{
+    public function testUuidv1CanBeGenerated()
+    {
+        $em = new EntityManager();
+        $generator = new UuidV1Generator();
+
+        $uuid = $generator->generate($em, new Entity());
+
+        $this->assertInstanceOf(AbstractUid::class, $uuid);
+        $this->assertInstanceOf(UuidV1::class, $uuid);
+        $this->assertTrue(UuidV1::isValid($uuid));
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/IdGenerator/UuidV4GeneratorTest.php b/src/Symfony/Bridge/Doctrine/Tests/IdGenerator/UuidV4GeneratorTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\IdGenerator;
+
+use Doctrine\ORM\Mapping\Entity;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Doctrine\IdGenerator\UuidV4Generator;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\UuidV4;
+
+class UuidV4GeneratorTest extends TestCase
+{
+    public function testUuidv4CanBeGenerated()
+    {
+        $em = new EntityManager();
+        $generator = new UuidV4Generator();
+
+        $uuid = $generator->generate($em, new Entity());
+
+        $this->assertInstanceOf(AbstractUid::class, $uuid);
+        $this->assertInstanceOf(UuidV4::class, $uuid);
+        $this->assertTrue(UuidV4::isValid($uuid));
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/IdGenerator/UuidV6GeneratorTest.php b/src/Symfony/Bridge/Doctrine/Tests/IdGenerator/UuidV6GeneratorTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\IdGenerator;
+
+use Doctrine\ORM\Mapping\Entity;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Doctrine\IdGenerator\UuidV6Generator;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\UuidV6;
+
+class UuidV6GeneratorTest extends TestCase
+{
+    public function testUuidv6CanBeGenerated()
+    {
+        $em = new EntityManager();
+        $generator = new UuidV6Generator();
+
+        $uuid = $generator->generate($em, new Entity());
+
+        $this->assertInstanceOf(AbstractUid::class, $uuid);
+        $this->assertInstanceOf(UuidV6::class, $uuid);
+        $this->assertTrue(UuidV6::isValid($uuid));
+    }
+}