diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index d3b2125..4de053a 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -29,6 +29,11 @@
uuid_parse
+
+
+ parent::__construct($fields, $numberConverter, $codec, $timeConverter)
+
+
$this
@@ -36,6 +41,11 @@
$this
+
+
+ parent::__construct($fields, $numberConverter, $codec, $timeConverter)
+
+
$this
@@ -43,6 +53,11 @@
$this
+
+
+ parent::__construct($fields, $numberConverter, $codec, $timeConverter)
+
+
shell_exec('id -g')
@@ -60,6 +75,11 @@
$macs[]
+
+
+ Uuid
+
+
$this
@@ -79,6 +99,31 @@
$this
+
+
+ parent::__construct($fields, $numberConverter, $codec, $timeConverter)
+
+
+
+
+ parent::__construct($fields, $numberConverter, $codec, $timeConverter)
+
+
+
+
+ parent::__construct($fields, $numberConverter, $codec, $timeConverter)
+
+
+
+
+ parent::__construct($fields, $numberConverter, $codec, $timeConverter)
+
+
+
+
+ parent::__construct($fields, $numberConverter, $codec, $timeConverter)
+
+
$this->isNegative
@@ -90,6 +135,21 @@
+
+ self::getFactory()
+ self::getFactory()
+ self::getFactory()
+ self::getFactory()
+ self::getFactory()
+ self::getFactory()
+ self::getFactory()
+ self::getFactory()
+ self::getFactory()
+ self::getFactory()
+ self::getFactory()
+ self::getFactory()
+ self::getFactory()
+
getFactory
getFactory
diff --git a/psalm.xml b/psalm.xml
index 8f7deb5..930f633 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
errorLevel="1"
cacheDirectory="./build/cache/psalm"
- errorBaseline="./psalm-baseline.xml">
+ errorBaseline="psalm-baseline.xml">
diff --git a/src/Uuid.php b/src/Uuid.php
index b94cffe..7b2d35c 100644
--- a/src/Uuid.php
+++ b/src/Uuid.php
@@ -207,6 +207,10 @@ class Uuid implements Rfc4122UuidInterface
* $namespaceSha1Uuid = Uuid::uuid5(Uuid::NAMESPACE_URL, 'http://php.net/');
* ```
*
+ * @deprecated ramsey/uuid version 5 will no longer allow direct
+ * instantiation of the base Ramsey\Uuid\Uuid class. Instead, you must
+ * use factories to create UUID objects.
+ *
* @param Rfc4122FieldsInterface $fields The fields from which to construct a UUID
* @param NumberConverterInterface $numberConverter The number converter to use
* for converting hex values to/from integers
@@ -338,6 +342,9 @@ class Uuid implements Rfc4122UuidInterface
/**
* Returns the factory used to create UUIDs
+ *
+ * @deprecated ramsey/uuid version 5 will no longer support getting a
+ * factory instance from the base Ramsey\Uuid\Uuid class.
*/
public static function getFactory(): UuidFactoryInterface
{
@@ -351,6 +358,11 @@ class Uuid implements Rfc4122UuidInterface
/**
* Sets the factory used to create UUIDs
*
+ * @deprecated ramsey/uuid version 5 will no longer support setting a
+ * factory instance on the base Ramsey\Uuid\Uuid class. If you need to
+ * customize the properties used to build a UUID, use one of the
+ * dedicated factories that version 5 will introduce.
+ *
* @param UuidFactoryInterface $factory A factory that will be used by this
* class to create UUIDs
*/
diff --git a/src/functions.php b/src/functions.php
index f5df148..d722f06 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -25,7 +25,7 @@ use Ramsey\Uuid\Type\Integer as IntegerObject;
* @param Hexadecimal|int|string|null $node A 48-bit number representing the
* hardware address; this number may be represented as an integer or a
* hexadecimal string
- * @param int $clockSeq A 14-bit number used to help avoid duplicates that
+ * @param int|null $clockSeq A 14-bit number used to help avoid duplicates that
* could arise when the clock is set backwards in time or if the node ID
* changes
*
@@ -111,7 +111,7 @@ function v5($ns, string $name): string
*
* @param Hexadecimal|null $node A 48-bit number representing the hardware
* address
- * @param int $clockSeq A 14-bit number used to help avoid duplicates that
+ * @param int|null $clockSeq A 14-bit number used to help avoid duplicates that
* could arise when the clock is set backwards in time or if the node ID
* changes
*