wip

Author: rogervila

src/Uuid.php

@@ -19,6 +19,7 @@
 use Ramsey\Uuid\Codec\CodecInterface;
 use Ramsey\Uuid\Converter\NumberConverterInterface;
 use Ramsey\Uuid\Converter\TimeConverterInterface;
+use Ramsey\Uuid\Exception\InvalidUuidStringException;
 use Ramsey\Uuid\Exception\UnsupportedOperationException;
 use Ramsey\Uuid\Fields\FieldsInterface;
 use Ramsey\Uuid\Lazy\LazyUuidFromString;
@@ -494,6 +495,28 @@ public static function fromString(string $uuid): UuidInterface
         return self::getFactory()->fromString($uuid);
     }
 
+    /**
+     * Creates a UUID from a valid string representation, validated against the isValid method
+     *
+     * @param string $uuid A valid UUID string representation
+     *
+     * @return UuidInterface A UuidInterface instance created from a valid UUID
+     *     string representation
+     *
+     * @throws InvalidUuidStringException
+     *
+     * @psalm-pure note: changing the internal factory is an edge case not covered by purity invariants,
+     *             but under constant factory setups, this method operates in functionally pure manners
+     */
+    public static function fromStrictString(string $uuid): UuidInterface
+    {
+        if (! self::isValid($uuid)) {
+            throw new InvalidUuidStringException('Invalid UUID string: ' . $uuid);
+        }
+
+        return self::fromString($uuid);
+    }
+
     /**
      * Creates a UUID from a DateTimeInterface instance
      *

src/UuidFactory.php

@@ -19,6 +19,7 @@
 use Ramsey\Uuid\Codec\CodecInterface;
 use Ramsey\Uuid\Converter\NumberConverterInterface;
 use Ramsey\Uuid\Converter\TimeConverterInterface;
+use Ramsey\Uuid\Exception\InvalidUuidStringException;
 use Ramsey\Uuid\Generator\DceSecurityGeneratorInterface;
 use Ramsey\Uuid\Generator\DefaultTimeGenerator;
 use Ramsey\Uuid\Generator\NameGeneratorInterface;
@@ -279,6 +280,18 @@ public function fromString(string $uuid): UuidInterface
         return $this->codec->decode($uuid);
     }
 
+    /**
+     * @psalm-pure
+     */
+    public function fromStrictString(string $uuid): UuidInterface
+    {
+        if (! $this->getValidator()->validate($uuid)) {
+            throw new InvalidUuidStringException('Invalid UUID string: ' . $uuid);
+        }
+
+        return $this->codec->decode($uuid);
+    }
+
     /**
      * @psalm-pure
      */

src/UuidFactoryInterface.php

@@ -15,6 +15,7 @@
 namespace Ramsey\Uuid;
 
 use DateTimeInterface;
+use Ramsey\Uuid\Exception\InvalidUuidStringException;
 use Ramsey\Uuid\Type\Hexadecimal;
 use Ramsey\Uuid\Type\Integer as IntegerObject;
 use Ramsey\Uuid\Validator\ValidatorInterface;
@@ -80,6 +81,20 @@ public function fromInteger(string $integer): UuidInterface;
      */
     public function fromString(string $uuid): UuidInterface;
 
+    /**
+     * Creates a UUID from a valid string representation, validated against the isValid method
+     *
+     * @param string $uuid A valid UUID string representation
+     *
+     * @return UuidInterface A UuidInterface instance created from a valid UUID
+     *     string representation
+     *
+     * @throws InvalidUuidStringException
+     *
+     * @psalm-pure
+     */
+    public function fromStrictString(string $uuid): UuidInterface;
+
     /**
      * Returns the validator to use for the factory
      *

tests/UuidTest.php

@@ -73,6 +73,34 @@ public function testFromString(): void
             Uuid::fromString('ff6f8cb0-c57d-11e1-9b21-0800200c9a66')
                 ->toString()
         );
+
+        $this->assertSame(
+            '00000000-0000-0000-0000-000000000000',
+            Uuid::fromString('00000000000000000000000000000000')
+                ->toString()
+        );
+    }
+
+    public function testFromStrictString(): void
+    {
+        $this->assertSame(
+            'ff6f8cb0-c57d-11e1-9b21-0800200c9a66',
+            Uuid::fromStrictString('ff6f8cb0-c57d-11e1-9b21-0800200c9a66')
+                ->toString()
+        );
+
+        $this->assertSame(
+            '00000000-0000-0000-0000-000000000000',
+            Uuid::fromStrictString('00000000-0000-0000-0000-000000000000')
+                ->toString()
+        );
+    }
+
+    public function testFromStrictStringWithInvalidUuidString(): void
+    {
+        $this->expectException(InvalidUuidStringException::class);
+
+        Uuid::fromStrictString('00000000000000000000000000000000');
     }
 
     public function testFromHexadecimal(): void