Fixed return type for Collection::map*. (#6798)

hyperf · May 24, 2024 · 51476aa · 51476aa
1 parent c8b9660
commit 51476aa
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md
@@ -2,7 +2,7 @@
 
 ## Fixed
 
-- [#6796](https://github.com/hyperf/hyperf/pull/6796) Fixed bug that the return type of `Collection::mapInto()` is invalid sometimes.
+- [#6796](https://github.com/hyperf/hyperf/pull/6796) [#6798](https://github.com/hyperf/hyperf/pull/6798) Fixed bug that the return type of `Collection::mapInto()` is invalid sometimes.
 
 ## Added
 

diff --git a/src/collection/src/Collection.php b/src/collection/src/Collection.php
@@ -664,7 +664,7 @@ public function map(callable $callback): self|static
      * @param callable(TValue, TKey): array<TMapToDictionaryKey, TMapToDictionaryValue> $callback
      * @return static<TMapToDictionaryKey, array<int, TMapToDictionaryValue>>
      */
-    public function mapToDictionary(callable $callback): static
+    public function mapToDictionary(callable $callback): self|static
     {
         $dictionary = [];
         foreach ($this->items as $key => $item) {
@@ -689,7 +689,7 @@ public function mapToDictionary(callable $callback): static
      * @param callable(TValue, TKey): array<TMapWithKeysKey, TMapWithKeysValue> $callback
      * @return static<TMapWithKeysKey, TMapWithKeysValue>
      */
-    public function mapWithKeys(callable $callback): static
+    public function mapWithKeys(callable $callback): self|static
     {
         return new static(Arr::mapWithKeys($this->items, $callback));
     }

diff --git a/src/collection/src/Enumerable.php b/src/collection/src/Enumerable.php
@@ -635,7 +635,7 @@ public function map(callable $callback): self|static;
     /**
      * Run a map over each nested chunk of items.
      */
-    public function mapSpread(callable $callback): static;
+    public function mapSpread(callable $callback): self|static;
 
     /**
      * Run a dictionary map over the items.
@@ -648,7 +648,7 @@ public function mapSpread(callable $callback): static;
      * @param callable(TValue, TKey): array<TMapToDictionaryKey, TMapToDictionaryValue> $callback
      * @return static<TMapToDictionaryKey, array<int, TMapToDictionaryValue>>
      */
-    public function mapToDictionary(callable $callback): static;
+    public function mapToDictionary(callable $callback): self|static;
 
     /**
      * Run a grouping map over the items.
@@ -661,7 +661,7 @@ public function mapToDictionary(callable $callback): static;
      * @param callable(TValue, TKey): array<TMapToGroupsKey, TMapToGroupsValue> $callback
      * @return static<TMapToGroupsKey, static<int, TMapToGroupsValue>>
      */
-    public function mapToGroups(callable $callback): static;
+    public function mapToGroups(callable $callback): self|static;
 
     /**
      * Run an associative map over each of the items.
@@ -674,7 +674,7 @@ public function mapToGroups(callable $callback): static;
      * @param callable(TValue, TKey): array<TMapWithKeysKey, TMapWithKeysValue> $callback
      * @return static<TMapWithKeysKey, TMapWithKeysValue>
      */
-    public function mapWithKeys(callable $callback);
+    public function mapWithKeys(callable $callback): self|static;
 
     /**
      * Map a collection and flatten the result by a single level.
@@ -685,7 +685,7 @@ public function mapWithKeys(callable $callback);
      * @param callable(TValue, TKey): (array<TFlatMapKey, TFlatMapValue>|Collection<TFlatMapKey, TFlatMapValue>) $callback
      * @return static<TFlatMapKey, TFlatMapValue>
      */
-    public function flatMap(callable $callback): static;
+    public function flatMap(callable $callback): self|static;
 
     /**
      * Map the values into a new class.

diff --git a/src/collection/src/LazyCollection.php b/src/collection/src/LazyCollection.php
@@ -788,7 +788,7 @@ public function map(callable $callback): self|static
      * @param callable(TValue, TKey): array<TMapToDictionaryKey, TMapToDictionaryValue> $callback
      * @return static<TMapToDictionaryKey, array<int, TMapToDictionaryValue>>
      */
-    public function mapToDictionary(callable $callback): static
+    public function mapToDictionary(callable $callback): self|static
     {
         return $this->passthru('mapToDictionary', func_get_args());
     }
@@ -804,7 +804,7 @@ public function mapToDictionary(callable $callback): static
      * @param callable(TValue, TKey): array<TMapWithKeysKey, TMapWithKeysValue> $callback
      * @return static<TMapWithKeysKey, TMapWithKeysValue>
      */
-    public function mapWithKeys(callable $callback)
+    public function mapWithKeys(callable $callback): self|static
     {
         return new static(function () use ($callback) {
             foreach ($this as $key => $value) {

diff --git a/src/collection/src/Traits/EnumeratesValues.php b/src/collection/src/Traits/EnumeratesValues.php
@@ -408,7 +408,7 @@ public function isNotEmpty(): bool
      * @param callable(mixed...): TMapSpreadValue $callback
      * @return static<TKey, TMapSpreadValue>
      */
-    public function mapSpread(callable $callback): static
+    public function mapSpread(callable $callback): self|static
     {
         return $this->map(function ($chunk, $key) use ($callback) {
             $chunk[] = $key;
@@ -428,7 +428,7 @@ public function mapSpread(callable $callback): static
      * @param callable(TValue, TKey): array<TMapToGroupsKey, TMapToGroupsValue> $callback
      * @return static<TMapToGroupsKey, static<int, TMapToGroupsValue>>
      */
-    public function mapToGroups(callable $callback): static
+    public function mapToGroups(callable $callback): self|static
     {
         $groups = $this->mapToDictionary($callback);
 
@@ -444,7 +444,7 @@ public function mapToGroups(callable $callback): static
      * @param callable(TValue, TKey): (array<TFlatMapKey, TFlatMapValue>|Collection<TFlatMapKey, TFlatMapValue>) $callback
      * @return static<TFlatMapKey, TFlatMapValue>
      */
-    public function flatMap(callable $callback): static
+    public function flatMap(callable $callback): self|static
     {
         return $this->map($callback)->collapse();
     }