Merge branch '5.0RC'5.0

1 files changed, 20 insertions, 15 deletions

diff --git a/vendor/ramsey/uuid/src/UuidFactoryInterface.php b/vendor/ramsey/uuid/src/UuidFactoryInterface.php
index a228f5bc7..1c1651d64 100644
--- a/vendor/ramsey/uuid/src/UuidFactoryInterface.php
+++ b/vendor/ramsey/uuid/src/UuidFactoryInterface.php
@@ -14,6 +14,11 @@
 
 namespace Ramsey\Uuid;
 
+use Exception;
+use InvalidArgumentException;
+use Ramsey\Uuid\Exception\InvalidUuidStringException;
+use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
+
 /**
  * UuidFactoryInterface defines common functionality all `UuidFactory` instances
  * must implement
@@ -29,10 +34,10 @@ interface UuidFactoryInterface
      *     could arise when the clock is set backwards in time or if the node ID
      *     changes.
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and
+     * @throws UnsatisfiedDependencyException if called on a 32-bit system and
      *     `Moontoast\Math\BigNumber` is not present
-     * @throws \InvalidArgumentException
-     * @throws \Exception if it was not possible to gather sufficient entropy
+     * @throws InvalidArgumentException
+     * @throws Exception if it was not possible to gather sufficient entropy
      */
     public function uuid1($node = null, $clockSeq = null);
 
@@ -40,10 +45,10 @@ interface UuidFactoryInterface
      * Generate a version 3 UUID based on the MD5 hash of a namespace identifier
      * (which is a UUID) and a name (which is a string).
      *
-     * @param string $ns The UUID namespace in which to create the named UUID
+     * @param string|UuidInterface $ns The UUID namespace in which to create the named UUID
      * @param string $name The name to create a UUID for
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws InvalidUuidStringException
      */
     public function uuid3($ns, $name);
 
@@ -51,9 +56,9 @@ interface UuidFactoryInterface
      * Generate a version 4 (random) UUID.
      *
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
-     * @throws \InvalidArgumentException
-     * @throws \Exception
+     * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
+     * @throws InvalidArgumentException
+     * @throws Exception
      */
     public function uuid4();
 
@@ -61,10 +66,10 @@ interface UuidFactoryInterface
      * Generate a version 5 UUID based on the SHA-1 hash of a namespace
      * identifier (which is a UUID) and a name (which is a string).
      *
-     * @param string $ns The UUID namespace in which to create the named UUID
+     * @param string|UuidInterface $ns The UUID namespace in which to create the named UUID
      * @param string $name The name to create a UUID for
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws InvalidUuidStringException
      */
     public function uuid5($ns, $name);
 
@@ -73,8 +78,8 @@ interface UuidFactoryInterface
      *
      * @param string $bytes A 16-byte string representation of a UUID
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
-     * @throws \InvalidArgumentException if string has not 16 characters
+     * @throws InvalidUuidStringException
+     * @throws InvalidArgumentException if string has not 16 characters
      */
     public function fromBytes($bytes);
 
@@ -83,7 +88,7 @@ interface UuidFactoryInterface
      *
      * @param string $uuid A string representation of a UUID
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws InvalidUuidStringException
      */
     public function fromString($uuid);
 
@@ -96,8 +101,8 @@ interface UuidFactoryInterface
      * @param mixed $integer The integer to use when creating a `Uuid` from an
      *     integer; may be of any type understood by the configured number converter
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
+     * @throws InvalidUuidStringException
      */
     public function fromInteger($integer);
 }