Skip to content

Commit 1d06e02

Browse files
committed
Collection: Remove unnecessary templates from interface
1 parent e2e1262 commit 1d06e02

File tree

1 file changed

+13
-20
lines changed

1 file changed

+13
-20
lines changed

src/Toolkit/Contract/Collection/DictionaryInterface.php

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -130,18 +130,16 @@ public function reverse();
130130
*
131131
* The callback's return values are discarded.
132132
*
133-
* @template TMode of int-mask-of<DictionaryInterface::*>
134-
*
135133
* @param (callable(TValue, TValue|null $next, TValue|null $prev): mixed)|(callable(TKey, TKey|null $next, TKey|null $prev): mixed)|(callable(array{TKey,TValue}, array{TKey,TValue}|null $next, array{TKey,TValue}|null $prev): mixed) $callback
136134
* @phpstan-param (
137-
* TMode is 3|11|19
135+
* $mode is 3|11|19
138136
* ? (callable(array{TKey,TValue}, array{TKey,TValue}|null $next, array{TKey,TValue}|null $prev): mixed)
139-
* : (TMode is 2|10|18
137+
* : ($mode is 2|10|18
140138
* ? (callable(TKey, TKey|null $next, TKey|null $prev): mixed)
141139
* : (callable(TValue, TValue|null $next, TValue|null $prev): mixed)
142140
* )
143141
* ) $callback
144-
* @param TMode $mode
142+
* @param int-mask-of<DictionaryInterface::*> $mode
145143
* @return $this
146144
*/
147145
public function forEach(callable $callback, int $mode = DictionaryInterface::CALLBACK_USE_VALUE);
@@ -150,38 +148,35 @@ public function forEach(callable $callback, int $mode = DictionaryInterface::CAL
150148
* Pass each item in the collection to a callback and populate a new
151149
* collection with its return values
152150
*
153-
* @template TMode of int-mask-of<DictionaryInterface::*>
154151
* @template TReturn of TValue
155152
*
156153
* @param (callable(TValue, TValue|null $next, TValue|null $prev): TReturn)|(callable(TKey, TKey|null $next, TKey|null $prev): TReturn)|(callable(array{TKey,TValue}, array{TKey,TValue}|null $next, array{TKey,TValue}|null $prev): TReturn) $callback
157154
* @phpstan-param (
158-
* TMode is 3|11|19
155+
* $mode is 3|11|19
159156
* ? (callable(array{TKey,TValue}, array{TKey,TValue}|null $next, array{TKey,TValue}|null $prev): TReturn)
160-
* : (TMode is 2|10|18
157+
* : ($mode is 2|10|18
161158
* ? (callable(TKey, TKey|null $next, TKey|null $prev): TReturn)
162159
* : (callable(TValue, TValue|null $next, TValue|null $prev): TReturn)
163160
* )
164161
* ) $callback
165-
* @param TMode $mode
162+
* @param int-mask-of<DictionaryInterface::*> $mode
166163
* @return static<TKey,TReturn>
167164
*/
168165
public function map(callable $callback, int $mode = DictionaryInterface::CALLBACK_USE_VALUE);
169166

170167
/**
171168
* Reduce the collection to items that satisfy a callback
172169
*
173-
* @template TMode of int-mask-of<DictionaryInterface::*>
174-
*
175170
* @param (callable(TValue, TValue|null $next, TValue|null $prev): bool)|(callable(TKey, TKey|null $next, TKey|null $prev): bool)|(callable(array{TKey,TValue}, array{TKey,TValue}|null $next, array{TKey,TValue}|null $prev): bool) $callback
176171
* @phpstan-param (
177-
* TMode is 3|11|19
172+
* $mode is 3|11|19
178173
* ? (callable(array{TKey,TValue}, array{TKey,TValue}|null $next, array{TKey,TValue}|null $prev): bool)
179-
* : (TMode is 2|10|18
174+
* : ($mode is 2|10|18
180175
* ? (callable(TKey, TKey|null $next, TKey|null $prev): bool)
181176
* : (callable(TValue, TValue|null $next, TValue|null $prev): bool)
182177
* )
183178
* ) $callback
184-
* @param TMode $mode
179+
* @param int-mask-of<DictionaryInterface::*> $mode
185180
* @return static
186181
*/
187182
public function filter(callable $callback, int $mode = DictionaryInterface::CALLBACK_USE_VALUE);
@@ -190,19 +185,17 @@ public function filter(callable $callback, int $mode = DictionaryInterface::CALL
190185
* Get the first item that satisfies a callback, or null if there is no such
191186
* item in the collection
192187
*
193-
* @template TMode of int-mask-of<DictionaryInterface::*>
194-
*
195188
* @param (callable(TValue, TValue|null $next, TValue|null $prev): bool)|(callable(TKey, TKey|null $next, TKey|null $prev): bool)|(callable(array{TKey,TValue}, array{TKey,TValue}|null $next, array{TKey,TValue}|null $prev): bool) $callback
196189
* @phpstan-param (
197-
* TMode is 3|11|19
190+
* $mode is 3|11|19
198191
* ? (callable(array{TKey,TValue}, array{TKey,TValue}|null $next, array{TKey,TValue}|null $prev): bool)
199-
* : (TMode is 2|10|18
192+
* : ($mode is 2|10|18
200193
* ? (callable(TKey, TKey|null $next, TKey|null $prev): bool)
201194
* : (callable(TValue, TValue|null $next, TValue|null $prev): bool)
202195
* )
203196
* ) $callback
204-
* @param TMode $mode
205-
* @return (TMode is 16|17|18|19 ? TKey : TValue)|null
197+
* @param int-mask-of<DictionaryInterface::*> $mode
198+
* @return ($mode is 16|17|18|19 ? TKey : TValue)|null
206199
*/
207200
public function find(callable $callback, int $mode = DictionaryInterface::CALLBACK_USE_VALUE | DictionaryInterface::FIND_VALUE);
208201

0 commit comments

Comments
 (0)