Fixes and improvements

Author: javiereguiluz

components/uid.rst

@@ -37,46 +37,33 @@ Use the named constructors of the ``Uuid`` class or any of the specific classes
 to create each type of UUID::
 
     use Symfony\Component\Uid\Uuid;
-    use Symfony\Component\Uid\UuidV1;
-    use Symfony\Component\Uid\UuidV3;
-    use Symfony\Component\Uid\UuidV4;
-    use Symfony\Component\Uid\UuidV5;
-    use Symfony\Component\Uid\UuidV6;
 
     // UUID type 1 generates the UUID using the MAC address of your device and a timestamp.
     // Both are obtained automatically, so you don't have to pass any constructor argument.
-    $uuid = Uuid::v1();
-    $uuid = new UuidV1();
+    $uuid = Uuid::v1(); // $uuid is an instance of Symfony\Component\Uid\UuidV1
 
     // UUID type 4 generates a random UUID, so you don't have to pass any constructor argument.
-    $uuid = Uuid::v4();
-    $uuid = new UuidV4();
+    $uuid = Uuid::v4(); // $uuid is an instance of Symfony\Component\Uid\UuidV4
 
     // UUID type 3 and 5 generate a UUID hashing the given namespace and name. Type 3 uses
     // MD5 hashes and Type 5 uses SHA-1. The namespace is another UUID (e.g. a Type 4 UUID)
     // and the name is an arbitrary string (e.g. a product name; if it's unique).
-    $namespace = new UuidV4();
+    $namespace = Uuid::v4();
     $name = $product->getUniqueName();
 
-    $uuid = Uuid::v3($namespace, $name);
-    $uuid = new UuidV3($namespace, $name);
-
-    $uuid = Uuid::v5($namespace, $name);
-    $uuid = new UuidV5($namespace, $name);
+    $uuid = Uuid::v3($namespace, $name); // $uuid is an instance of Symfony\Component\Uid\UuidV3
+    $uuid = Uuid::v5($namespace, $name); // $uuid is an instance of Symfony\Component\Uid\UuidV5
 
     // UUID type 6 is not part of the UUID standard. It's lexicographically sortable
     // (like ULIDs) and contains a 60-bit timestamp and 63 extra unique bits.
     // It's defined in http://gh.peabody.io/uuidv6/
-    $uuid = Uuid::v6();
-    $uuid = new UuidV6();
+    $uuid = Uuid::v6(); // $uuid is an instance of Symfony\Component\Uid\UuidV6
 
-If your UUID is generated by another system, use the regular constructor of the
-``Uuid`` class (or the static ``fromString()`` method) to create an object and
-make use of the utilities available for Symfony UUIDs::
+If your UUID is generated by another system, use the ``fromString()`` method to
+create an object and make use of the utilities available for Symfony UUIDs::
 
     // this value is generated somewhere else
     $uuidValue = 'd9e7a184-5d5b-11ea-a62a-3499710062d0';
-    $uuid = new Uuid($uuidValue);
     $uuid = Uuid::fromString($uuidValue);
 
 If your UUIDs are generated in binary format, use the ``fromBinary()`` method
@@ -89,8 +76,7 @@ Converting UUIDs
 
 Use these methods to transform the UUID object into different bases::
 
-    $uuidValue = 'd9e7a184-5d5b-11ea-a62a-3499710062d0';
-    $uuid = new Uuid($uuidValue);
+    $uuid = new Uuid::fromString('d9e7a184-5d5b-11ea-a62a-3499710062d0');
 
     $uuid->toBinary();  // string(16) "..." (binary contents can't be printed)
     $uuid->toBase32();  // string(26) "6SWYGR8QAV27NACAHMK5RG0RPG"
@@ -103,8 +89,8 @@ Working with UUIDs
 UUID objects created with the ``Uuid`` class can use the following methods
 (which are equivalent to the ``uuid_*()`` method of the PHP extension)::
 
-    use Symfony\Component\Uid\Uuid;
     use Symfony\Component\Uid\NilUuid;
+    use Symfony\Component\Uid\Uuid;
 
     // checking if the UUID is null (note that the class is called
     // NilUuid instead of NullUuid to follow the UUID standard notation)
@@ -151,10 +137,12 @@ Instantiate the ``Ulid`` class to generate a random ULID value::
 
     $ulid = new Ulid();  // e.g. 01AN4Z07BY79KA1307SR9X4MV3
 
-If your ULID is generated by another system, pass its value to the constructor::
+If your UUID is generated by another system, use the ``fromString()`` method to
+create an object and make use of the utilities available for Symfony ULIDs::
 
+    // this value is generated somewhere else
     $ulidValue = '01E439TP9XJZ9RPFH3T1PYBCR8';
-    $ulid = new Ulid($ulidValue);
+    $ulid = Ulid::fromString($ulidValue);
 
 If your ULIDs are generated in binary format, use the ``fromBinary()`` method
 to create the objects for them::
@@ -166,8 +154,7 @@ Converting ULIDs
 
 Use these methods to transform the ULID object into different bases::
 
-    $ulidValue = '01E439TP9XJZ9RPFH3T1PYBCR8';
-    $ulid = new Ulid($ulidValue);
+    $ulid = Ulid::fromString('01E439TP9XJZ9RPFH3T1PYBCR8');
 
     $ulid->toBinary();  // string(16) "..." (binary contents can't be printed)
     $ulid->toBase32();  // string(26) "01E439TP9XJZ9RPFH3T1PYBCR8"