diff --git a/tests/data/doctrine_entities/EntityWithUlid.php b/tests/data/doctrine_entities/EntityWithUlid.php new file mode 100644 index 0000000..f8e9160 --- /dev/null +++ b/tests/data/doctrine_entities/EntityWithUlid.php @@ -0,0 +1,34 @@ +id = new Ulid(); + } + + public function getId(): Ulid + { + return $this->id; + } +} diff --git a/tests/data/doctrine_entities/EntityWithUuid.php b/tests/data/doctrine_entities/EntityWithUuid.php deleted file mode 100644 index eb401a3..0000000 --- a/tests/data/doctrine_entities/EntityWithUuid.php +++ /dev/null @@ -1,34 +0,0 @@ -id = Uuid::v4(); - } - - public function getId(): Uuid - { - return $this->id; - } -} diff --git a/tests/unit/Codeception/Module/Doctrine2Test.php b/tests/unit/Codeception/Module/Doctrine2Test.php index 389a243..216038d 100644 --- a/tests/unit/Codeception/Module/Doctrine2Test.php +++ b/tests/unit/Codeception/Module/Doctrine2Test.php @@ -25,8 +25,8 @@ use QuirkyFieldName\AssociationHost; use QuirkyFieldName\Embeddable; use QuirkyFieldName\EmbeddableHost; -use Symfony\Bridge\Doctrine\Types\UuidType; -use Symfony\Component\Uid\Uuid; +use Symfony\Bridge\Doctrine\Types\UlidType; +use Symfony\Component\Uid\Ulid; final class DoctrineTest extends Unit { @@ -36,8 +36,8 @@ final class DoctrineTest extends Unit protected static function _setUpBeforeClass() { - if (!Type::hasType('uuid')) { - Type::addType('uuid', UuidType::class); + if (!Type::hasType('ulid')) { + Type::addType('ulid', UlidType::class); } } @@ -69,7 +69,7 @@ protected function _setUp() require_once $dir . "/CircularRelations/A.php"; require_once $dir . "/CircularRelations/B.php"; require_once $dir . "/CircularRelations/C.php"; - require_once $dir . '/EntityWithUuid.php'; + require_once $dir . '/EntityWithUlid.php'; $sqliteDriver = 'sqlite3'; // The driver "sqlite3" is only available as-of doctrine/dbal:3.5 @@ -111,7 +111,7 @@ protected function _setUp() $this->em->getClassMetadata(\CircularRelations\A::class), $this->em->getClassMetadata(\CircularRelations\B::class), $this->em->getClassMetadata(\CircularRelations\C::class), - $this->em->getClassMetadata(EntityWithUuid::class), + $this->em->getClassMetadata(EntityWithUlid::class), ]); $container = Stub::make(ModuleContainer::class); @@ -435,13 +435,13 @@ public function testCompositePrimaryKeyWithEntities() /** * The purpose of this test is to verify that entites with object @id, that are - * not entites itself, e.g. Symfony\Component\Uid\Uuid, don't break the debug message. + * not entites itself, e.g. Symfony\Component\Uid\Ulid, don't break the debug message. */ public function testDebugEntityWithNonEntityButObjectId() { - $pk = $this->module->haveInRepository(EntityWithUuid::class); + $pk = $this->module->haveInRepository(EntityWithUlid::class); - self::assertInstanceOf(Uuid::class, $pk); + self::assertInstanceOf(Ulid::class, $pk); } public function testRefresh()