Skip to content

Commit 6523bc8

Browse files
phpstan-botclaude
authored andcommitted
Look up the array_map() callback argument with ArgumentsNormalizer::getArgByPositionOrName()
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 99f760f commit 6523bc8

2 files changed

Lines changed: 17 additions & 16 deletions

File tree

‎src/Parser/ArrayMapArgVisitor.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Override;
66
use PhpParser\Node;
77
use PhpParser\NodeVisitorAbstract;
8+
use PHPStan\Analyser\ArgumentsNormalizer;
89
use PHPStan\DependencyInjection\AutowiredService;
910
use PHPStan\Turbo\ShadowedByTurboExtension;
1011
use function count;
@@ -22,16 +23,19 @@ public function enterNode(Node $node): ?Node
2223
if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {
2324
$functionName = $node->name->toLowerString();
2425
if ($functionName === 'array_map') {
25-
$callbackArg = null;
26+
$args = $node->getArgs();
2627
$arrayArgs = [];
27-
foreach ($node->getArgs() as $i => $arg) {
28-
if ($arg->name === null ? $i === 0 : $arg->name->toString() === 'callback') {
29-
$callbackArg = $arg;
28+
foreach ($args as $i => $arg) {
29+
if ($arg->name === null && $i === 0) {
30+
continue;
31+
}
32+
if ($arg->name !== null && $arg->name->toString() === 'callback') {
3033
continue;
3134
}
3235

3336
$arrayArgs[] = $arg;
3437
}
38+
$callbackArg = ArgumentsNormalizer::getArgByPositionOrName($args, 0, 'callback');
3539
if ($callbackArg !== null && count($arrayArgs) > 0) {
3640
$callbackArg->value->setAttribute(self::ATTRIBUTE_NAME, $arrayArgs);
3741
}

‎turbo-ext/src/ArrayMapArgVisitor.cpp‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,25 @@ class ArrayMapArgVisitor
4545
if (functionName == NULL) return !EG(exception);
4646
if (!visitors::lowerEquals(functionName, "array_map")) return true;
4747

48-
/* the callback argument - the positional first one or the one named
49-
* "callback" - and every other argument */
50-
zend_object *callbackArg = NULL;
48+
/* every argument except the positional first one and the one named
49+
* "callback" */
5150
zv::Arr arrayArgs = zv::Arr::create(zend_hash_num_elements(Z_ARRVAL_P(args)));
5251
for (auto entry : zv::ArrRef(args)) {
5352
zv::Ref arg = entry.value().deref();
5453
if (!arg.isObject()) continue;
5554
zval *argName = argNameProp.of(arg.asObject());
56-
bool isCallback;
57-
if (argName != NULL && Z_TYPE_P(argName) == IS_OBJECT) {
55+
bool named = argName != NULL && Z_TYPE_P(argName) == IS_OBJECT;
56+
bool firstPosition = entry.stringKeyOrNull() == NULL && entry.indexKey() == 0;
57+
if (!named && firstPosition) continue;
58+
if (named) {
5859
zend_string *name = visitors::nameString(Z_OBJ_P(argName), identifierProp);
59-
isCallback = name != NULL && zend_string_equals_literal(name, "callback");
60-
} else {
61-
isCallback = entry.stringKeyOrNull() == NULL && entry.indexKey() == 0;
62-
}
63-
if (isCallback) {
64-
callbackArg = arg.asObject();
65-
continue;
60+
if (name != NULL && zend_string_equals_literal(name, "callback")) continue;
6661
}
6762
arrayArgs.push(arg);
6863
}
6964

65+
/* ArgumentsNormalizer::getArgByPositionOrName($args, 0, 'callback') */
66+
zend_object *callbackArg = visitors::argForParameter(args, 0, "callback");
7067
if (callbackArg == NULL || zend_hash_num_elements(arrayArgs.table()) == 0) return true;
7168
zval *value = argValueProp.of(callbackArg);
7269
if (value == NULL || Z_TYPE_P(value) != IS_OBJECT) return true;

0 commit comments

Comments
 (0)