Merge branch '7.4RC'7.4

2 files changed, 8 insertions, 3 deletions

diff --git a/vendor/ramsey/uuid/src/Builder/BuilderCollection.php b/vendor/ramsey/uuid/src/Builder/BuilderCollection.php
index 89fa1e3c8..9df3110fd 100644
--- a/vendor/ramsey/uuid/src/Builder/BuilderCollection.php
+++ b/vendor/ramsey/uuid/src/Builder/BuilderCollection.php
@@ -27,6 +27,11 @@ use Traversable;
 /**
  * A collection of UuidBuilderInterface objects
  *
+ * @deprecated this class has been deprecated, and will be removed in 5.0.0. The use-case for this class comes from
+ *             a pre-`phpstan/phpstan` and pre-`vimeo/psalm` ecosystem, in which type safety had to be mostly enforced
+ *             at runtime: that is no longer necessary, now that you can safely verify your code to be correct, and use
+ *             more generic types like `iterable<T>` instead.
+ *
  * @extends AbstractCollection<UuidBuilderInterface>
  */
 class BuilderCollection extends AbstractCollection
diff --git a/vendor/ramsey/uuid/src/Builder/FallbackBuilder.php b/vendor/ramsey/uuid/src/Builder/FallbackBuilder.php
index 470d2f755..8ab438a19 100644
--- a/vendor/ramsey/uuid/src/Builder/FallbackBuilder.php
+++ b/vendor/ramsey/uuid/src/Builder/FallbackBuilder.php
@@ -28,14 +28,14 @@ use Ramsey\Uuid\UuidInterface;
 class FallbackBuilder implements UuidBuilderInterface
 {
     /**
-     * @var BuilderCollection
+     * @var iterable<UuidBuilderInterface>
      */
     private $builders;
 
     /**
-     * @param BuilderCollection $builders An array of UUID builders
+     * @param iterable<UuidBuilderInterface> $builders An array of UUID builders
      */
-    public function __construct(BuilderCollection $builders)
+    public function __construct(iterable $builders)
     {
         $this->builders = $builders;
     }