Skip to content

Commit 077d8f4

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: [HttpClient] Fix setting CURLMOPT_MAXCONNECTS throw a meaningful exception when parsing dotenv files with BOM [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
2 parents 9430a0c + 9c483af commit 077d8f4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Constraints/Uuid.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Uuid extends Constraint
4545
*/
4646
protected static $errorNames = self::ERROR_NAMES;
4747

48-
// Possible versions defined by RFC 4122
48+
// Possible versions defined by RFC 9562/4122
4949
public const V1_MAC = 1;
5050
public const V2_DCE = 2;
5151
public const V3_MD5 = 3;
@@ -80,7 +80,7 @@ class Uuid extends Constraint
8080
public $message = 'This is not a valid UUID.';
8181

8282
/**
83-
* Strict mode only allows UUIDs that meet the formal definition and formatting per RFC 4122.
83+
* Strict mode only allows UUIDs that meet the formal definition and formatting per RFC 9562/4122.
8484
*
8585
* Set this to `false` to allow legacy formats with different dash positioning or wrapping characters
8686
*

Constraints/UuidValidator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
/**
2020
* Validates whether the value is a valid UUID (also known as GUID).
2121
*
22-
* Strict validation will allow a UUID as specified per RFC 4122.
22+
* Strict validation will allow a UUID as specified per RFC 9562/4122.
2323
* Loose validation will allow any type of UUID.
2424
*
2525
* @author Colin O'Dell <[email protected]>
2626
* @author Bernhard Schussek <[email protected]>
2727
*
28-
* @see http://tools.ietf.org/html/rfc4122
28+
* @see https://datatracker.ietf.org/doc/html/rfc9562
2929
* @see https://en.wikipedia.org/wiki/Universally_unique_identifier
3030
*/
3131
class UuidValidator extends ConstraintValidator

0 commit comments

Comments
 (0)