3 files changed, 22 insertions, 64 deletions

diff --git a/vendor/ramsey/uuid/src/Nonstandard/Fields.php b/vendor/ramsey/uuid/src/Nonstandard/Fields.php
index 927bc6a26..5dfe61076 100644
--- a/vendor/ramsey/uuid/src/Nonstandard/Fields.php
+++ b/vendor/ramsey/uuid/src/Nonstandard/Fields.php
@@ -48,25 +48,18 @@ final class Fields implements FieldsInterface
     use VariantTrait;
 
     /**
-     * @var string
-     */
-    private $bytes;
-
-    /**
      * @param string $bytes A 16-byte binary string representation of a UUID
      *
      * @throws InvalidArgumentException if the byte string is not exactly 16 bytes
      */
-    public function __construct(string $bytes)
+    public function __construct(private string $bytes)
     {
-        if (strlen($bytes) !== 16) {
+        if (strlen($this->bytes) !== 16) {
             throw new InvalidArgumentException(
                 'The byte string must be 16 bytes long; '
-                . 'received ' . strlen($bytes) . ' bytes'
+                . 'received ' . strlen($this->bytes) . ' bytes'
             );
         }
-
-        $this->bytes = $bytes;
     }
 
     public function getBytes(): string
@@ -130,4 +123,9 @@ final class Fields implements FieldsInterface
     {
         return false;
     }
+
+    public function isMax(): bool
+    {
+        return false;
+    }
 }
diff --git a/vendor/ramsey/uuid/src/Nonstandard/UuidBuilder.php b/vendor/ramsey/uuid/src/Nonstandard/UuidBuilder.php
index 0c8927738..82efd402f 100644
--- a/vendor/ramsey/uuid/src/Nonstandard/UuidBuilder.php
+++ b/vendor/ramsey/uuid/src/Nonstandard/UuidBuilder.php
@@ -30,27 +30,15 @@ use Throwable;
 class UuidBuilder implements UuidBuilderInterface
 {
     /**
-     * @var NumberConverterInterface
-     */
-    private $numberConverter;
-
-    /**
-     * @var TimeConverterInterface
-     */
-    private $timeConverter;
-
-    /**
      * @param NumberConverterInterface $numberConverter The number converter to
      *     use when constructing the Nonstandard\Uuid
      * @param TimeConverterInterface $timeConverter The time converter to use
      *     for converting timestamps extracted from a UUID to Unix timestamps
      */
     public function __construct(
-        NumberConverterInterface $numberConverter,
-        TimeConverterInterface $timeConverter
+        private NumberConverterInterface $numberConverter,
+        private TimeConverterInterface $timeConverter
     ) {
-        $this->numberConverter = $numberConverter;
-        $this->timeConverter = $timeConverter;
     }
 
     /**
diff --git a/vendor/ramsey/uuid/src/Nonstandard/UuidV6.php b/vendor/ramsey/uuid/src/Nonstandard/UuidV6.php
index 05586b3eb..1a7bbaf75 100644
--- a/vendor/ramsey/uuid/src/Nonstandard/UuidV6.php
+++ b/vendor/ramsey/uuid/src/Nonstandard/UuidV6.php
@@ -14,39 +14,34 @@ declare(strict_types=1);
 
 namespace Ramsey\Uuid\Nonstandard;
 
-use DateTimeImmutable;
-use DateTimeInterface;
 use Ramsey\Uuid\Codec\CodecInterface;
 use Ramsey\Uuid\Converter\NumberConverterInterface;
 use Ramsey\Uuid\Converter\TimeConverterInterface;
-use Ramsey\Uuid\Exception\DateTimeException;
 use Ramsey\Uuid\Exception\InvalidArgumentException;
 use Ramsey\Uuid\Lazy\LazyUuidFromString;
 use Ramsey\Uuid\Rfc4122\FieldsInterface as Rfc4122FieldsInterface;
+use Ramsey\Uuid\Rfc4122\TimeTrait;
 use Ramsey\Uuid\Rfc4122\UuidInterface;
 use Ramsey\Uuid\Rfc4122\UuidV1;
 use Ramsey\Uuid\Uuid;
-use Throwable;
-
-use function hex2bin;
-use function str_pad;
-use function substr;
-
-use const STR_PAD_LEFT;
 
 /**
- * Ordered-time, or version 6, UUIDs include timestamp, clock sequence, and node
- * values that are combined into a 128-bit unsigned integer
+ * Reordered time, or version 6, UUIDs include timestamp, clock sequence, and
+ * node values that are combined into a 128-bit unsigned integer
+ *
+ * @deprecated Use {@see \Ramsey\Uuid\Rfc4122\UuidV6} instead.
  *
  * @link https://github.com/uuid6/uuid6-ietf-draft UUID version 6 IETF draft
  * @link http://gh.peabody.io/uuidv6/ "Version 6" UUIDs
  *
  * @psalm-immutable
  */
-final class UuidV6 extends Uuid implements UuidInterface
+class UuidV6 extends Uuid implements UuidInterface
 {
+    use TimeTrait;
+
     /**
-     * Creates a version 6 (time-based) UUID
+     * Creates a version 6 (reordered time) UUID
      *
      * @param Rfc4122FieldsInterface $fields The fields from which to construct a UUID
      * @param NumberConverterInterface $numberConverter The number converter to use
@@ -62,10 +57,10 @@ final class UuidV6 extends Uuid implements UuidInterface
         CodecInterface $codec,
         TimeConverterInterface $timeConverter
     ) {
-        if ($fields->getVersion() !== Uuid::UUID_TYPE_PEABODY) {
+        if ($fields->getVersion() !== Uuid::UUID_TYPE_REORDERED_TIME) {
             throw new InvalidArgumentException(
                 'Fields used to create a UuidV6 must represent a '
-                . 'version 6 (ordered-time) UUID'
+                . 'version 6 (reordered time) UUID'
             );
         }
 
@@ -73,29 +68,6 @@ final class UuidV6 extends Uuid implements UuidInterface
     }
 
     /**
-     * Returns a DateTimeInterface object representing the timestamp associated
-     * with the UUID
-     *
-     * @return DateTimeImmutable A PHP DateTimeImmutable instance representing
-     *     the timestamp of a version 6 UUID
-     */
-    public function getDateTime(): DateTimeInterface
-    {
-        $time = $this->timeConverter->convertTime($this->fields->getTimestamp());
-
-        try {
-            return new DateTimeImmutable(
-                '@'
-                . $time->getSeconds()->toString()
-                . '.'
-                . str_pad($time->getMicroseconds()->toString(), 6, '0', STR_PAD_LEFT)
-            );
-        } catch (Throwable $e) {
-            throw new DateTimeException($e->getMessage(), (int) $e->getCode(), $e);
-        }
-    }
-
-    /**
      * Converts this UUID into an instance of a version 1 UUID
      */
     public function toUuidV1(): UuidV1
@@ -116,7 +88,7 @@ final class UuidV6 extends Uuid implements UuidInterface
     /**
      * Converts a version 1 UUID into an instance of a version 6 UUID
      */
-    public static function fromUuidV1(UuidV1 $uuidV1): UuidV6
+    public static function fromUuidV1(UuidV1 $uuidV1): \Ramsey\Uuid\Rfc4122\UuidV6
     {
         $hex = $uuidV1->getHex()->toString();
         $hex = substr($hex, 13, 3)