Skip to content

Commit

Permalink
Merge branch '6.4' into 7.1
Browse files Browse the repository at this point in the history
* 6.4:
  [Serializer] Fix for method named `get()`
  [Notifier][TurboSMS] Process partial accepted response from transport
  [HttpClient] Fix setting CURLMOPT_MAXCONNECTS
  throw a meaningful exception when parsing dotenv files with BOM
  [FrameworkBundle] Fix schema & finish incomplete tests for lock & semaphore config
  [Cache] Fix RedisSentinel params types
  [FrameworkBundle] Fix service reset between tests
  [Uid][Serializer][Validator] Mention RFC 9562
  make sure temp files can be cleaned up on Windows
  • Loading branch information
xabbuh committed Sep 17, 2024
2 parents 8217753 + 31b08ba commit 8c7bb8a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion AbstractUid.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public static function fromBase32(string $uid): static
}

/**
* @param string $uid A valid RFC 9562/4122 uid
*
* @throws \InvalidArgumentException When the passed value is not valid
*/
public static function fromRfc4122(string $uid): static
Expand Down Expand Up @@ -120,7 +122,7 @@ public function toBase32(): string
}

/**
* Returns the identifier as a RFC4122 case-insensitive string.
* Returns the identifier as a RFC 9562/4122 case-insensitive string.
*
* @see https://tools.ietf.org/html/rfc4122#section-3
*
Expand Down
2 changes: 1 addition & 1 deletion BinaryUtil.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class BinaryUtil
'u' => 52, 'v' => 53, 'w' => 54, 'x' => 55, 'y' => 56, 'z' => 57,
];

// https://tools.ietf.org/html/rfc4122#section-4.1.4
// https://datatracker.ietf.org/doc/html/rfc9562#section-5.1
// 0x01b21dd213814000 is the number of 100-ns intervals between the
// UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00.
private const TIME_OFFSET_INT = 0x01B21DD213814000;
Expand Down
2 changes: 1 addition & 1 deletion Uuid.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/**
* @author Grégoire Pineau <[email protected]>
*
* @see https://tools.ietf.org/html/rfc4122#appendix-C for details about namespaces
* @see https://datatracker.ietf.org/doc/html/rfc9562/#section-6.6 for details about namespaces
*/
class Uuid extends AbstractUid
{
Expand Down

0 comments on commit 8c7bb8a

Please sign in to comment.