Support named arguments in the Closure::bind() scope binding

The visitor read the arguments positionally, so a call like
Closure::bind(closure: ..., newScope: Target::class, newThis: null) was not rescoped
(it failed safe to the out-of-class report). Resolve the closure/newThis/newScope
arguments by name and position instead.

Author: zonuexe

src/Parser/ClosureBindArgVisitor.php

@@ -12,7 +12,6 @@
 use function array_key_exists;
 use function array_shift;
 use function array_unshift;
-use function count;
 use function spl_object_id;
 
 #[AutowiredService]
@@ -58,14 +57,39 @@ public function enterNode(Node $node): ?Node
 			&& $node->name->toLowerString() === 'bind'
 			&& !$node->isFirstClassCallable()
 		) {
-			$args = $node->getArgs();
-			if (count($args) > 1) {
-				$args[0]->setAttribute(self::ATTRIBUTE_NAME, true);
+			$closureArg = null;
+			$newThisArg = null;
+			$newScopeArg = null;
+			foreach ($node->getArgs() as $i => $arg) {
+				if ($arg->name === null) {
+					if ($i === 0) {
+						$closureArg = $arg;
+					} elseif ($i === 1) {
+						$newThisArg = $arg;
+					} elseif ($i === 2) {
+						$newScopeArg = $arg;
+					}
+					continue;
+				}
+
+				if ($arg->name->toString() === 'closure') {
+					$closureArg = $arg;
+				} elseif ($arg->name->toString() === 'newThis') {
+					$newThisArg = $arg;
+				} elseif ($arg->name->toString() === 'newScope') {
+					$newScopeArg = $arg;
+				}
+			}
+
+			if ($closureArg !== null) {
+				if ($newThisArg !== null) {
+					$closureArg->setAttribute(self::ATTRIBUTE_NAME, true);
+				}
 
-				$closure = $args[0]->value;
+				$closure = $closureArg->value;
 				if ($closure instanceof Expr\Closure || $closure instanceof Expr\ArrowFunction) {
 					// null means default scope "static"
-					$this->boundClosures[spl_object_id($closure)] = $args[2]->value ?? null;
+					$this->boundClosures[spl_object_id($closure)] = $newScopeArg !== null ? $newScopeArg->value : null;
 				}
 			}
 		}

tests/PHPStan/Analyser/nsrt/closure-bind-scope-named-arguments.php

@@ -0,0 +1,30 @@
+<?php // lint >= 8.0
+
+declare(strict_types = 1);
+
+namespace ClosureBindScopeNamedArguments;
+
+use Closure;
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	protected const A = 'Foo';
+
+}
+
+final class Bar extends Foo
+{
+
+	protected const A = 'Bar';
+
+}
+
+// The bind scope is resolved by argument name, so any order works.
+assertType("'Foo'", Closure::bind(closure: static fn () => self::A, newThis: null, newScope: Foo::class)());
+assertType("'Foo'", Closure::bind(closure: static fn () => self::A, newScope: Foo::class, newThis: null)());
+assertType("'Bar'", Closure::bind(newScope: Bar::class, closure: static fn () => self::A, newThis: null)());
+
+// Positional and named arguments mixed together.
+assertType("'Foo'", Closure::bind(static fn () => parent::A, null, newScope: Bar::class)());