1 files changed, 26 insertions, 21 deletions

diff --git a/vendor/ramsey/uuid/src/Rfc4122/UuidBuilder.php b/vendor/ramsey/uuid/src/Rfc4122/UuidBuilder.php
index 736931af2..859649fd9 100644
--- a/vendor/ramsey/uuid/src/Rfc4122/UuidBuilder.php
+++ b/vendor/ramsey/uuid/src/Rfc4122/UuidBuilder.php
@@ -17,11 +17,13 @@ namespace Ramsey\Uuid\Rfc4122;
 use Ramsey\Uuid\Builder\UuidBuilderInterface;
 use Ramsey\Uuid\Codec\CodecInterface;
 use Ramsey\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\Converter\Time\UnixTimeConverter;
 use Ramsey\Uuid\Converter\TimeConverterInterface;
 use Ramsey\Uuid\Exception\UnableToBuildUuidException;
 use Ramsey\Uuid\Exception\UnsupportedOperationException;
-use Ramsey\Uuid\Nonstandard\UuidV6;
+use Ramsey\Uuid\Math\BrickMathCalculator;
 use Ramsey\Uuid\Rfc4122\UuidInterface as Rfc4122UuidInterface;
+use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
 use Throwable;
 
@@ -32,15 +34,7 @@ use Throwable;
  */
 class UuidBuilder implements UuidBuilderInterface
 {
-    /**
-     * @var NumberConverterInterface
-     */
-    private $numberConverter;
-
-    /**
-     * @var TimeConverterInterface
-     */
-    private $timeConverter;
+    private TimeConverterInterface $unixTimeConverter;
 
     /**
      * Constructs the DefaultUuidBuilder
@@ -48,14 +42,18 @@ class UuidBuilder implements UuidBuilderInterface
      * @param NumberConverterInterface $numberConverter The number converter to
      *     use when constructing the Uuid
      * @param TimeConverterInterface $timeConverter The time converter to use
-     *     for converting timestamps extracted from a UUID to Unix timestamps
+     *     for converting Gregorian time extracted from version 1, 2, and 6
+     *     UUIDs to Unix timestamps
+     * @param TimeConverterInterface|null $unixTimeConverter The time converter
+     *     to use for converter Unix Epoch time extracted from version 7 UUIDs
+     *     to Unix timestamps
      */
     public function __construct(
-        NumberConverterInterface $numberConverter,
-        TimeConverterInterface $timeConverter
+        private NumberConverterInterface $numberConverter,
+        private TimeConverterInterface $timeConverter,
+        ?TimeConverterInterface $unixTimeConverter = null
     ) {
-        $this->numberConverter = $numberConverter;
-        $this->timeConverter = $timeConverter;
+        $this->unixTimeConverter = $unixTimeConverter ?? new UnixTimeConverter(new BrickMathCalculator());
     }
 
     /**
@@ -71,25 +69,32 @@ class UuidBuilder implements UuidBuilderInterface
     public function build(CodecInterface $codec, string $bytes): UuidInterface
     {
         try {
+            /** @var Fields $fields */
             $fields = $this->buildFields($bytes);
 
             if ($fields->isNil()) {
                 return new NilUuid($fields, $this->numberConverter, $codec, $this->timeConverter);
             }
 
+            if ($fields->isMax()) {
+                return new MaxUuid($fields, $this->numberConverter, $codec, $this->timeConverter);
+            }
+
             switch ($fields->getVersion()) {
-                case 1:
+                case Uuid::UUID_TYPE_TIME:
                     return new UuidV1($fields, $this->numberConverter, $codec, $this->timeConverter);
-                case 2:
+                case Uuid::UUID_TYPE_DCE_SECURITY:
                     return new UuidV2($fields, $this->numberConverter, $codec, $this->timeConverter);
-                case 3:
+                case Uuid::UUID_TYPE_HASH_MD5:
                     return new UuidV3($fields, $this->numberConverter, $codec, $this->timeConverter);
-                case 4:
+                case Uuid::UUID_TYPE_RANDOM:
                     return new UuidV4($fields, $this->numberConverter, $codec, $this->timeConverter);
-                case 5:
+                case Uuid::UUID_TYPE_HASH_SHA1:
                     return new UuidV5($fields, $this->numberConverter, $codec, $this->timeConverter);
-                case 6:
+                case Uuid::UUID_TYPE_REORDERED_TIME:
                     return new UuidV6($fields, $this->numberConverter, $codec, $this->timeConverter);
+                case Uuid::UUID_TYPE_UNIX_TIME:
+                    return new UuidV7($fields, $this->numberConverter, $codec, $this->unixTimeConverter);
             }
 
             throw new UnsupportedOperationException(