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
28 changes: 13 additions & 15 deletions src/Analyser/NodeScopeResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -5281,25 +5281,23 @@ public function createCallableParameters(Scope $scope, Expr $closureExpr, ?array
}

$acceptors = $passedToType->getCallableParametersAcceptors($scope);
if (count($acceptors) > 0) {
foreach ($acceptors as $acceptor) {
if ($callableParameters === null) {
$callableParameters = $acceptor->getParameters();
continue;
}

$newParameters = [];
foreach ($acceptor->getParameters() as $i => $callableParameter) {
if (!array_key_exists($i, $callableParameters)) {
$newParameters[] = $callableParameter;
continue;
}
foreach ($acceptors as $acceptor) {
if ($callableParameters === null) {
$callableParameters = $acceptor->getParameters();
continue;
}

$newParameters[] = $callableParameters[$i]->union($callableParameter);
$newParameters = [];
foreach ($acceptor->getParameters() as $i => $callableParameter) {
if (!array_key_exists($i, $callableParameters)) {
$newParameters[] = $callableParameter;
continue;
}

$callableParameters = $newParameters;
$newParameters[] = $callableParameters[$i]->union($callableParameter);
}

$callableParameters = $newParameters;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Reflection/Callables/FunctionCallableVariant.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ public function __construct(
}

/**
* @param ExtendedParametersAcceptor[] $variants
* @return self[]
* @param list<ExtendedParametersAcceptor> $variants
* @return list<self>
*/
public static function createFromVariants(FunctionReflection|ExtendedMethodReflection $function, array $variants): array
{
Expand Down
2 changes: 1 addition & 1 deletion src/Type/ObjectType.php
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,7 @@ public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope)
}

/**
* @return CallableParametersAcceptor[]|null
* @return list<CallableParametersAcceptor>|null
*/
private function findCallableParametersAcceptors(): ?array
{
Expand Down
2 changes: 1 addition & 1 deletion src/Type/Type.php
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public function exponentiate(Type $exponent): Type;
public function isCallable(): TrinaryLogic;

/**
* @return CallableParametersAcceptor[]
* @return list<CallableParametersAcceptor>
*/
public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope): array;

Expand Down
Loading