changed return type for getUidObject to FQCN and renamed it to getUidClass

Gennadi Janzen · gennadigennadigennadi · commit 95c9daf98a1d · 2020-09-02T21:26:47.000+02:00
* return null explicitly
diff --git a/src/Symfony/Bridge/Doctrine/Types/AbstractBinaryUidType.php b/src/Symfony/Bridge/Doctrine/Types/AbstractBinaryUidType.php
@@ -18,7 +18,7 @@
 
 abstract class AbstractBinaryUidType extends GuidType
 {
-    abstract protected function getUidObject(): AbstractUid;
+    abstract protected function getUidClass(): string;
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string
     {
@@ -44,7 +44,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?Abstract
         }
 
         try {
-            $uuid = $this->getUidObject()::fromString($value);
+            $uuid = $this->getUidClass()::fromString($value);
         } catch (\InvalidArgumentException $e) {
             throw ConversionException::conversionFailed($value, $this->getName());
         }
@@ -67,10 +67,12 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
 
         try {
             if (\is_string($value) || method_exists($value, '__toString')) {
-                return $this->getUidObject()::fromString((string) $value)->toBinary();
+                return $this->getUidClass()::fromString((string) $value)->toBinary();
             }
         } catch (\InvalidArgumentException $e) {
             throw ConversionException::conversionFailed($value, $this->getName());
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Types/AbstractUidType.php b/src/Symfony/Bridge/Doctrine/Types/AbstractUidType.php
@@ -18,7 +18,7 @@
 
 abstract class AbstractUidType extends GuidType
 {
-    abstract protected function getUidObject(): AbstractUid;
+    abstract protected function getUidClass(): string;
 
     /**
      * @throws ConversionException
@@ -34,7 +34,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?Abstract
         }
 
         try {
-            $uuid = $this->getUidObject()::fromString($value);
+            $uuid = $this->getUidClass()::fromString($value);
         } catch (\InvalidArgumentException $e) {
             throw ConversionException::conversionFailed($value, $this->getName());
         }
@@ -57,7 +57,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
 
         if (
             (\is_string($value) || method_exists($value, '__toString'))
-            && $this->getUidObject()::isValid((string) $value)
+            && $this->getUidClass()::isValid((string) $value)
         ) {
             return (string) $value;
         }
diff --git a/src/Symfony/Bridge/Doctrine/Types/UlidBinaryType.php b/src/Symfony/Bridge/Doctrine/Types/UlidBinaryType.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine\Types;
 
-use Symfony\Component\Uid\AbstractUid;
 use Symfony\Component\Uid\Ulid;
 
 final class UlidBinaryType extends AbstractBinaryUidType
@@ -21,8 +20,8 @@ public function getName(): string
         return 'ulid_binary';
     }
 
-    protected function getUidObject(): AbstractUid
+    protected function getUidClass(): string
     {
-        return new Ulid();
+        return Ulid::class;
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Types/UlidType.php b/src/Symfony/Bridge/Doctrine/Types/UlidType.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine\Types;
 
-use Symfony\Component\Uid\AbstractUid;
 use Symfony\Component\Uid\Ulid;
 
 final class UlidType extends AbstractUidType
@@ -21,8 +20,8 @@ public function getName(): string
         return 'ulid';
     }
 
-    protected function getUidObject(): AbstractUid
+    protected function getUidClass(): string
     {
-        return new Ulid();
+        return Ulid::class;
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Types/UuidBinaryType.php b/src/Symfony/Bridge/Doctrine/Types/UuidBinaryType.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine\Types;
 
-use Symfony\Component\Uid\AbstractUid;
 use Symfony\Component\Uid\Uuid;
 
 final class UuidBinaryType extends AbstractBinaryUidType
@@ -21,8 +20,8 @@ public function getName(): string
         return 'uuid_binary';
     }
 
-    protected function getUidObject(): AbstractUid
+    protected function getUidClass(): string
     {
-        return Uuid::v4();
+        return Uuid::class;
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Types/UuidType.php b/src/Symfony/Bridge/Doctrine/Types/UuidType.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine\Types;
 
-use Symfony\Component\Uid\AbstractUid;
 use Symfony\Component\Uid\Uuid;
 
 final class UuidType extends AbstractUidType
@@ -21,8 +20,8 @@ public function getName(): string
         return 'uuid';
     }
 
-    protected function getUidObject(): AbstractUid
+    protected function getUidClass(): string
     {
-        return Uuid::v4();
+        return Uuid::class;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`abstract class AbstractBinaryUidType extends GuidType`
`20`	`20`	`{`
`21`		`- abstract protected function getUidObject(): AbstractUid;`
	`21`	`+ abstract protected function getUidClass(): string;`
`22`	`22`
`23`	`23`	`public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string`
`24`	`24`	`{`
`@@ -44,7 +44,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?Abstract`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`try {`
`47`		`- $uuid = $this->getUidObject()::fromString($value);`
	`47`	`+ $uuid = $this->getUidClass()::fromString($value);`
`48`	`48`	`} catch (\InvalidArgumentException $e) {`
`49`	`49`	`throw ConversionException::conversionFailed($value, $this->getName());`
`50`	`50`	`}`
`@@ -67,10 +67,12 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str`
`67`	`67`
`68`	`68`	`try {`
`69`	`69`	`if (\is_string($value) \|\| method_exists($value, '__toString')) {`
`70`		`- return $this->getUidObject()::fromString((string) $value)->toBinary();`
	`70`	`+ return $this->getUidClass()::fromString((string) $value)->toBinary();`
`71`	`71`	`}`
`72`	`72`	`} catch (\InvalidArgumentException $e) {`
`73`	`73`	`throw ConversionException::conversionFailed($value, $this->getName());`
`74`	`74`	`}`
	`75`	`+`
	`76`	`+ return null;`
`75`	`77`	`}`
`76`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bridge\Doctrine\Types;`
`13`	`13`
`14`		`-use Symfony\Component\Uid\AbstractUid;`
`15`	`14`	`use Symfony\Component\Uid\Ulid;`
`16`	`15`
`17`	`16`	`final class UlidBinaryType extends AbstractBinaryUidType`
`@@ -21,8 +20,8 @@ public function getName(): string`
`21`	`20`	`return 'ulid_binary';`
`22`	`21`	`}`
`23`	`22`
`24`		`- protected function getUidObject(): AbstractUid`
	`23`	`+ protected function getUidClass(): string`
`25`	`24`	`{`
`26`		`- return new Ulid();`
	`25`	`+ return Ulid::class;`
`27`	`26`	`}`
`28`	`27`	`}`