diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DoctrineBridge] accept converting Uid-as-strings to db-values

This commit is contained in:
Nicolas Grekas 2020-11-04 12:11:20 +01:00
parent 57e39b41b9
commit 20714d66c9
6 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Bridge/Doctrine/Tests/Types/UlidBinaryTypeTest.php
View File

@ -52,11 +52,12 @@ class UlidBinaryTypeTest extends TestCase
$this->assertEquals($expected, $actual);
}
public function testNotSupportedStringUlidConversionToDatabaseValue()
public function testStringUlidConvertsToDatabaseValue()
{
$this->expectException(ConversionException::class);
$expected = Ulid::fromString(self::DUMMY_ULID)->toBinary();
$actual = $this->type->convertToDatabaseValue(self::DUMMY_ULID, $this->platform);
$this->type->convertToDatabaseValue(self::DUMMY_ULID, $this->platform);
$this->assertEquals($expected, $actual);
}
public function testNotSupportedTypeConversionForDatabaseValue()

9
src/Symfony/Bridge/Doctrine/Tests/Types/UlidTypeTest.php
View File

@ -68,11 +68,14 @@ final class UlidTypeTest extends TestCase
$this->assertEquals('foo', $actual);
}
public function testNotSupportedUlidStringConversionToDatabaseValue()
public function testUlidStringConvertsToDatabaseValue()
{
$this->expectException(ConversionException::class);
$actual = $this->type->convertToDatabaseValue(self::DUMMY_ULID, $this->platform);
$ulid = Ulid::fromString(self::DUMMY_ULID);
$this->type->convertToDatabaseValue(self::DUMMY_ULID, $this->platform);
$expected = $ulid->toRfc4122();
$this->assertEquals($expected, $actual);
}
public function testNotSupportedTypeConversionForDatabaseValue()

14
src/Symfony/Bridge/Doctrine/Tests/Types/UuidBinaryTypeTest.php
View File

@ -52,11 +52,21 @@ class UuidBinaryTypeTest extends TestCase
$this->assertEquals($expected, $actual);
}
public function testNotSupportedStringUuidConversionToDatabaseValue()
public function testStringUuidConvertsToDatabaseValue()
{
$uuid = self::DUMMY_UUID;
$expected = uuid_parse(self::DUMMY_UUID);
$actual = $this->type->convertToDatabaseValue($uuid, $this->platform);
$this->assertEquals($expected, $actual);
}
public function testInvalidUuidConversionForDatabaseValue()
{
$this->expectException(ConversionException::class);
$this->type->convertToDatabaseValue(self::DUMMY_UUID, $this->platform);
$this->type->convertToDatabaseValue('abcdefg', $this->platform);
}
public function testNullConversionForDatabaseValue()

6
src/Symfony/Bridge/Doctrine/Tests/Types/UuidTypeTest.php
View File

@ -68,11 +68,11 @@ final class UuidTypeTest extends TestCase
$this->assertEquals('foo', $actual);
}
public function testNotSupportedUuidStringConversionToDatabaseValue()
public function testUuidStringConvertsToDatabaseValue()
{
$this->expectException(ConversionException::class);
$actual = $this->type->convertToDatabaseValue(self::DUMMY_UUID, $this->platform);
$this->type->convertToDatabaseValue(self::DUMMY_UUID, $this->platform);
$this->assertEquals(self::DUMMY_UUID, $actual);
}
public function testNotSupportedTypeConversionForDatabaseValue()

12
src/Symfony/Bridge/Doctrine/Types/AbstractBinaryUidType.php
View File

@ -61,11 +61,19 @@ abstract class AbstractBinaryUidType extends Type
return $value->toBinary();
}
if (null === $value) {
if (null === $value || '' === $value) {
return null;
}
throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', AbstractUid::class]);
if (!\is_string($value)) {
throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', 'string', AbstractUid::class]);
}
try {
return $this->getUidClass()::fromString($value)->toBinary();
} catch (\InvalidArgumentException $e) {
throw ConversionException::conversionFailed($value, $this->getName());
}
}
/**

12
src/Symfony/Bridge/Doctrine/Types/AbstractUidType.php
View File

@ -61,11 +61,19 @@ abstract class AbstractUidType extends Type
return $value->toRfc4122();
}
if (null === $value) {
if (null === $value || '' === $value) {
return null;
}
throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', AbstractUid::class]);
if (!\is_string($value)) {
throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', 'string', AbstractUid::class]);
}
try {
return $this->getUidClass()::fromString($value)->toRfc4122();
} catch (\InvalidArgumentException $e) {
throw ConversionException::conversionFailed($value, $this->getName());
}
}
/**