|
54 | 54 | use function constant; |
55 | 55 | use function count; |
56 | 56 | use function defined; |
| 57 | +use function in_array; |
57 | 58 | use function is_int; |
58 | 59 | use function is_string; |
59 | 60 | use function sprintf; |
@@ -232,62 +233,29 @@ public static function applyIntrinsicArgOverrides( |
232 | 233 | $positionalArgs = self::reorderIntrinsicArgs($args, $namedArgumentsVariants[0] ?? $parametersAcceptors[0]); |
233 | 234 | $arrayMapArgs = $positionalArgs[0]->value->getAttribute(ArrayMapArgVisitor::ATTRIBUTE_NAME); |
234 | 235 | if ($arrayMapArgs !== null) { |
235 | | - $callbackValueTypes = []; |
236 | | - $callbackArrayTypes = []; |
237 | | - $nativeCallbackValueTypes = []; |
238 | | - $nativeCallbackArrayTypes = []; |
| 236 | + $argTypes = []; |
| 237 | + $nativeArgTypes = []; |
| 238 | + $unpacked = []; |
239 | 239 | foreach ($arrayMapArgs as $arg) { |
240 | | - $argType = ($typeGetter)($arg->value); |
241 | | - $nativeArgType = ($nativeTypeGetter)($arg->value); |
242 | | - if ($arg->unpack) { |
243 | | - $constantArrays = $argType->getConstantArrays(); |
244 | | - if (count($constantArrays) > 0) { |
245 | | - foreach ($constantArrays as $constantArray) { |
246 | | - $valueTypes = $constantArray->getValueTypes(); |
247 | | - foreach ($valueTypes as $valueType) { |
248 | | - $callbackValueTypes[] = ($iterableValueTypeGetter)($valueType); |
249 | | - $callbackArrayTypes[] = $valueType; |
250 | | - } |
251 | | - } |
252 | | - } |
253 | | - $nativeConstantArrays = $nativeArgType->getConstantArrays(); |
254 | | - if (count($nativeConstantArrays) > 0) { |
255 | | - foreach ($nativeConstantArrays as $constantArray) { |
256 | | - $valueTypes = $constantArray->getValueTypes(); |
257 | | - foreach ($valueTypes as $valueType) { |
258 | | - $nativeCallbackValueTypes[] = ($iterableValueTypeGetter)($valueType); |
259 | | - $nativeCallbackArrayTypes[] = $valueType; |
260 | | - } |
261 | | - } |
262 | | - } |
263 | | - } else { |
264 | | - $callbackValueTypes[] = ($iterableValueTypeGetter)($argType); |
265 | | - $callbackArrayTypes[] = $argType; |
266 | | - $nativeCallbackValueTypes[] = ($iterableValueTypeGetter)($nativeArgType); |
267 | | - $nativeCallbackArrayTypes[] = $nativeArgType; |
268 | | - } |
269 | | - } |
270 | | - |
271 | | - $callbackParameters = []; |
272 | | - foreach (ArrayMapCallbackParameterTypes::addPaddingNull($callbackValueTypes, $callbackArrayTypes) as $valueType) { |
273 | | - $callbackParameters[] = new DummyParameter('item', $valueType, optional: false, passedByReference: PassedByReference::createNo(), variadic: false, defaultValue: null); |
274 | | - } |
275 | | - $nativeCallbackParameters = []; |
276 | | - foreach (ArrayMapCallbackParameterTypes::addPaddingNull($nativeCallbackValueTypes, $nativeCallbackArrayTypes) as $valueType) { |
277 | | - $nativeCallbackParameters[] = new DummyParameter('item', $valueType, optional: false, passedByReference: PassedByReference::createNo(), variadic: false, defaultValue: null); |
| 240 | + $argTypes[] = ($typeGetter)($arg->value); |
| 241 | + $nativeArgTypes[] = ($nativeTypeGetter)($arg->value); |
| 242 | + $unpacked[] = $arg->unpack; |
278 | 243 | } |
| 244 | + $callbackParameters = self::createArrayMapCallbackParameters($argTypes, $unpacked, $iterableValueTypeGetter); |
| 245 | + $nativeCallbackParameters = self::createArrayMapCallbackParameters($nativeArgTypes, $unpacked, $iterableValueTypeGetter); |
279 | 246 |
|
280 | 247 | $acceptor = $parametersAcceptors[0]; |
281 | 248 | $parameters = $acceptor->getParameters(); |
282 | | - if (isset($parameters[0])) { |
| 249 | + // with an unknown number of arrays, the callback keeps the type from the signature |
| 250 | + if (isset($parameters[0]) && $callbackParameters !== null) { |
283 | 251 | $callableType = new UnionType([ |
284 | 252 | new CallableType($callbackParameters, new MixedType(), false), |
285 | 253 | new NullType(), |
286 | 254 | ]); |
287 | | - $nativeCallableType = new UnionType([ |
| 255 | + $nativeCallableType = $nativeCallbackParameters !== null ? new UnionType([ |
288 | 256 | new CallableType($nativeCallbackParameters, new MixedType(), false), |
289 | 257 | new NullType(), |
290 | | - ]); |
| 258 | + ]) : self::wrapParameter($parameters[0])->getNativeType(); |
291 | 259 | $parameters[0] = self::overrideParameterType($parameters[0], $callableType, $nativeCallableType); |
292 | 260 | $parametersAcceptors = [self::overrideAcceptorParameters($acceptor, $parameters)]; |
293 | 261 | } |
@@ -1425,6 +1393,34 @@ private static function getCurlOptValueType(int $curlOpt): ?Type |
1425 | 1393 | return null; |
1426 | 1394 | } |
1427 | 1395 |
|
| 1396 | + /** |
| 1397 | + * @param list<Type> $argTypes |
| 1398 | + * @param list<bool> $unpacked |
| 1399 | + * @param Closure(Type): Type $iterableValueTypeGetter |
| 1400 | + * @return list<DummyParameter>|null null when the number of arrays is not known |
| 1401 | + */ |
| 1402 | + private static function createArrayMapCallbackParameters(array $argTypes, array $unpacked, Closure $iterableValueTypeGetter): ?array |
| 1403 | + { |
| 1404 | + if (in_array(true, $unpacked, true)) { |
| 1405 | + [$argTypes, $restType] = UnpackedArgumentTypes::expand($argTypes, $unpacked); |
| 1406 | + if ($restType !== null) { |
| 1407 | + return null; |
| 1408 | + } |
| 1409 | + } |
| 1410 | + |
| 1411 | + $valueTypes = []; |
| 1412 | + foreach ($argTypes as $argType) { |
| 1413 | + $valueTypes[] = ($iterableValueTypeGetter)($argType); |
| 1414 | + } |
| 1415 | + |
| 1416 | + $parameters = []; |
| 1417 | + foreach (ArrayMapCallbackParameterTypes::addPaddingNull($valueTypes, $argTypes) as $valueType) { |
| 1418 | + $parameters[] = new DummyParameter('item', $valueType, optional: false, passedByReference: PassedByReference::createNo(), variadic: false, defaultValue: null); |
| 1419 | + } |
| 1420 | + |
| 1421 | + return $parameters; |
| 1422 | + } |
| 1423 | + |
1428 | 1424 | private static function overrideParameterType(ParameterReflection $original, Type $type, Type $nativeType): ExtendedDummyParameter |
1429 | 1425 | { |
1430 | 1426 | $wrapped = self::wrapParameter($original); |
|
0 commit comments