cleanup

Gennadi Janzen · Gennadi Janzen · commit 8112bdc56dc2 · 2020-08-15T19:22:20.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Id/UuidV1Generator.php b/src/Symfony/Bridge/Doctrine/Id/UuidV1Generator.php
@@ -13,12 +13,12 @@
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Id\AbstractIdGenerator;
-use Symfony\Component\Uid\UuidV6;
+use Symfony\Component\Uid\UuidV1;
 
 final class UuidV1Generator extends AbstractIdGenerator
 {
-    public function generate(EntityManager $em, $entity): UuidV6
+    public function generate(EntityManager $em, $entity): UuidV1
     {
-        return new UuidV6();
+        return new UuidV1();
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Types/AbstractBinaryUidType.php b/src/Symfony/Bridge/Doctrine/Types/AbstractBinaryUidType.php
@@ -15,7 +15,6 @@
 use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\GuidType;
 use Symfony\Component\Uid\AbstractUid;
-use Symfony\Component\Uid\Uuid;
 
 abstract class AbstractBinaryUidType extends GuidType
 {
diff --git a/src/Symfony/Bridge/Doctrine/Types/AbstractUidType.php b/src/Symfony/Bridge/Doctrine/Types/AbstractUidType.php
@@ -57,9 +57,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
 
         if (
             (\is_string($value) || method_exists($value, '__toString'))
-            && $this->getUidObject()::isValid((string)$value)
+            && $this->getUidObject()::isValid((string) $value)
         ) {
-            return (string)$value;
+            return (string) $value;
         }
 
         throw ConversionException::conversionFailed($value, $this->getName());
diff --git a/src/Symfony/Bridge/Doctrine/Types/UlidBinaryType.php b/src/Symfony/Bridge/Doctrine/Types/UlidBinaryType.php
@@ -11,11 +11,8 @@
 
 namespace Symfony\Bridge\Doctrine\Types;
 
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\ConversionException;
 use Symfony\Component\Uid\AbstractUid;
 use Symfony\Component\Uid\Ulid;
-use Symfony\Component\Uid\Uuid;
 
 final class UlidBinaryType extends AbstractBinaryUidType
 {
@@ -24,7 +21,6 @@ public function getName(): string
         return 'ulid_binary';
     }
 
-
     protected function getUidObject(): AbstractUid
     {
         return new Ulid();
diff --git a/src/Symfony/Bridge/Doctrine/Types/UuidBinaryType.php b/src/Symfony/Bridge/Doctrine/Types/UuidBinaryType.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine\Types;
 
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\ConversionException;
 use Symfony\Component\Uid\AbstractUid;
 use Symfony\Component\Uid\Uuid;
 

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@`
`13`	`13`
`14`	`14`	`use Doctrine\ORM\EntityManager;`
`15`	`15`	`use Doctrine\ORM\Id\AbstractIdGenerator;`
`16`		`-use Symfony\Component\Uid\UuidV6;`
	`16`	`+use Symfony\Component\Uid\UuidV1;`
`17`	`17`
`18`	`18`	`final class UuidV1Generator extends AbstractIdGenerator`
`19`	`19`	`{`
`20`		`- public function generate(EntityManager $em, $entity): UuidV6`
	`20`	`+ public function generate(EntityManager $em, $entity): UuidV1`
`21`	`21`	`{`
`22`		`- return new UuidV6();`
	`22`	`+ return new UuidV1();`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`use Doctrine\DBAL\Types\ConversionException;`
`16`	`16`	`use Doctrine\DBAL\Types\GuidType;`
`17`	`17`	`use Symfony\Component\Uid\AbstractUid;`
`18`		`-use Symfony\Component\Uid\Uuid;`
`19`	`18`
`20`	`19`	`abstract class AbstractBinaryUidType extends GuidType`
`21`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bridge\Doctrine\Types;`
`13`	`13`
`14`		`-use Doctrine\DBAL\Platforms\AbstractPlatform;`
`15`		`-use Doctrine\DBAL\Types\ConversionException;`
`16`	`14`	`use Symfony\Component\Uid\AbstractUid;`
`17`	`15`	`use Symfony\Component\Uid\Ulid;`
`18`		`-use Symfony\Component\Uid\Uuid;`
`19`	`16`
`20`	`17`	`final class UlidBinaryType extends AbstractBinaryUidType`
`21`	`18`	`{`
`@@ -24,7 +21,6 @@ public function getName(): string`
`24`	`21`	`return 'ulid_binary';`
`25`	`22`	`}`
`26`	`23`
`27`		`-`
`28`	`24`	`protected function getUidObject(): AbstractUid`
`29`	`25`	`{`
`30`	`26`	`return new Ulid();`