bug #38600 [DoctrineBridge] Convert values to Rfc4122 before inserting them into the database (Kai)

nicolas-grekas · nicolas-grekas · commit 5ca43b855f2b · 2020-10-16T15:08:56.000+02:00
This PR was squashed before being merged into the 5.x branch. Discussion ---------- [DoctrineBridge] Convert values to Rfc4122 before inserting them into the database | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #38599 | License | MIT This PR formats the ULID into RFC4211 before inserting it into the database to avoid insertion failure on Postgres due to not recognized formating. Commits ------- fd3a6e8 [DoctrineBridge] Convert values to Rfc4122 before inserting them into the database
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Types/UlidTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Types/UlidTypeTest.php
@@ -48,7 +48,7 @@ public function testUlidConvertsToDatabaseValue(): void
     {
         $ulid = Ulid::fromString(self::DUMMY_ULID);
 
-        $expected = $ulid->__toString();
+        $expected = $ulid->toRfc4122();
         $actual = $this->type->convertToDatabaseValue($ulid, $this->platform);
 
         $this->assertEquals($expected, $actual);
@@ -60,7 +60,7 @@ public function testUlidInterfaceConvertsToDatabaseValue(): void
 
         $ulid
             ->expects($this->once())
-            ->method('__toString')
+            ->method('toRfc4122')
             ->willReturn('foo');
 
         $actual = $this->type->convertToDatabaseValue($ulid, $this->platform);
@@ -71,8 +71,11 @@ public function testUlidInterfaceConvertsToDatabaseValue(): void
     public function testUlidStringConvertsToDatabaseValue(): void
     {
         $actual = $this->type->convertToDatabaseValue(self::DUMMY_ULID, $this->platform);
+        $ulid = Ulid::fromString(self::DUMMY_ULID);
+
+        $expected = $ulid->toRfc4122();
 
-        $this->assertEquals(self::DUMMY_ULID, $actual);
+        $this->assertEquals($expected, $actual);
     }
 
     public function testInvalidUlidConversionForDatabaseValue(): void
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Types/UuidTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Types/UuidTypeTest.php
@@ -60,7 +60,7 @@ public function testUuidInterfaceConvertsToDatabaseValue(): void
 
         $uuid
             ->expects($this->once())
-            ->method('__toString')
+            ->method('toRfc4122')
             ->willReturn('foo');
 
         $actual = $this->type->convertToDatabaseValue($uuid, $this->platform);
diff --git a/src/Symfony/Bridge/Doctrine/Types/AbstractUidType.php b/src/Symfony/Bridge/Doctrine/Types/AbstractUidType.php
@@ -56,15 +56,21 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
         }
 
         if ($value instanceof AbstractUid) {
-            return (string) $value;
+            return $value->toRfc4122();
         }
 
         if (!\is_string($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
             return null;
         }
 
         if ($this->getUidClass()::isValid((string) $value)) {
-            return (string) $value;
+            try {
+                $uuid = $this->getUidClass()::fromString($value);
+
+                return $uuid->toRfc4122();
+            } catch (\InvalidArgumentException $e) {
+                throw ConversionException::conversionFailed($value, $this->getName());
+            }
         }
 
         throw ConversionException::conversionFailed($value, $this->getName());

Original file line number	Diff line number	Diff line change
`@@ -56,15 +56,21 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if ($value instanceof AbstractUid) {`
`59`		`- return (string) $value;`
	`59`	`+ return $value->toRfc4122();`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`if (!\is_string($value) && !(\is_object($value) && method_exists($value, '__toString'))) {`
`63`	`63`	`return null;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if ($this->getUidClass()::isValid((string) $value)) {`
`67`		`- return (string) $value;`
	`67`	`+ try {`
	`68`	`+ $uuid = $this->getUidClass()::fromString($value);`
	`69`	`+`
	`70`	`+ return $uuid->toRfc4122();`
	`71`	`+ } catch (\InvalidArgumentException $e) {`
	`72`	`+ throw ConversionException::conversionFailed($value, $this->getName());`
	`73`	`+ }`
`68`	`74`	`}`
`69`	`75`
`70`	`76`	`throw ConversionException::conversionFailed($value, $this->getName());`