Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Analyser/MutatingScope.php
Original file line number Diff line number Diff line change
Expand Up @@ -2347,7 +2347,11 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
/** @var non-empty-string $name */
$name = $node->name->value;
$functionName = new Name($name);
} elseif ($node->name instanceof FuncCall && $node->name->name instanceof Name) {
} elseif (
$node->name instanceof FuncCall
&& $node->name->name instanceof Name
&& $node->name->isFirstClassCallable()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like the purpose of this if was to resolve node like
strtoupper(...)($foo)
which is resolved to strtoupper($foo)
but it messed up with foo($bar)($baz)
which was resolved to foo($baz).

) {
$functionName = $node->name->name;
}

Expand Down
26 changes: 26 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-13296.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

namespace Bug13296;

use function PHPStan\Testing\assertType;

class Foo
{
/**
* @param non-empty-array<Bar> $a
* @param non-empty-array<int> $b
*/
public function test($a, $b)
{
assertType('string', current($a)($b));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without the fix, the type is understood as current($b) which is int.

}
}

class Bar
{
/** @return string */
public function __invoke($b)
{
return '';
}
}
Loading