Merge branch 'v11' into dropin-collection-enhancemnet

discord-php · Dec 24, 2024 · 3bceffb · 3bceffb
2 parents 51678a6 + 62cb15e
commit 3bceffb
Show file tree

Hide file tree

Showing 5 changed files with 870 additions and 709 deletions.
diff --git a/src/Discord/Helpers/CollectionInterface.php b/src/Discord/Helpers/CollectionInterface.php
@@ -34,7 +34,7 @@ public function filter(callable $callback): static;
     public function find(callable $callback);
     public function clear(): void;
     public function map(callable $callback): static;
-    public function merge(Collection $collection): static;
+    public function merge($collection): static;
     public function toArray();
     public function offsetExists($offset): bool;
     #[\ReturnTypeWillChange]

diff --git a/src/Discord/Helpers/CollectionTrait.php b/src/Discord/Helpers/CollectionTrait.php
@@ -332,11 +332,11 @@ public function map(callable $callback): static
     /**
      * Merges another collection into this collection.
      *
-     * @param Collection $collection
+     * @param $collection
      *
      * @return self
      */
-    public function merge(Collection $collection): self
+    public function merge($collection): self
     {
         $this->items = array_merge($this->items, $collection->toArray());