Skip to content

Simplify ParametersAcceptorSelector #4160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.1.x
Choose a base branch
from
Open

Simplify ParametersAcceptorSelector #4160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
128 changes: 63 additions & 65 deletions src/Reflection/ParametersAcceptorSelector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public static function selectFromArgs(
}
}

if (isset($args[0]) && (bool) $args[0]->getAttribute(ArrayFilterArgVisitor::ATTRIBUTE_NAME)) {
if ((bool) $args[0]->getAttribute(ArrayFilterArgVisitor::ATTRIBUTE_NAME)) {
if (isset($args[2])) {
$mode = $scope->getType($args[2]->value);
if ($mode instanceof ConstantIntegerType) {
Expand Down Expand Up @@ -203,7 +203,7 @@ public static function selectFromArgs(
];
}

if (isset($args[0]) && (bool) $args[0]->getAttribute(ArrayWalkArgVisitor::ATTRIBUTE_NAME)) {
if ((bool) $args[0]->getAttribute(ArrayWalkArgVisitor::ATTRIBUTE_NAME)) {
$arrayWalkParameters = [
new DummyParameter('item', $scope->getIterableValueType($scope->getType($args[0]->value)), false, PassedByReference::createReadsArgument(), false, null),
new DummyParameter('key', $scope->getIterableKeyType($scope->getType($args[0]->value)), false, PassedByReference::createNo(), false, null),
Expand Down Expand Up @@ -234,7 +234,7 @@ public static function selectFromArgs(
];
}

if (isset($args[0]) && (bool) $args[0]->getAttribute(ArrayFindArgVisitor::ATTRIBUTE_NAME)) {
Copy link
Contributor Author

@staabm staabm Jul 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

we already work on line 82 with $arrayMapArgs = $args[0]->value->getAttribute(ArrayMapArgVisitor::ATTRIBUTE_NAME); without a outer isset($args[0]), meaning the following isset checks are useless

if ((bool) $args[0]->getAttribute(ArrayFindArgVisitor::ATTRIBUTE_NAME)) {
$acceptor = $parametersAcceptors[0];
$parameters = $acceptor->getParameters();
$argType = $scope->getType($args[0]->value);
Expand Down Expand Up @@ -265,58 +265,14 @@ public static function selectFromArgs(
];
}

if (isset($args[0])) {
$closureBindToVar = $args[0]->getAttribute(ClosureBindToVarVisitor::ATTRIBUTE_NAME);
if (
$closureBindToVar !== null
&& $closureBindToVar instanceof Node\Expr\Variable
&& is_string($closureBindToVar->name)
) {
$varType = $scope->getType($closureBindToVar);
if ((new ObjectType(Closure::class))->isSuperTypeOf($varType)->yes()) {
$inFunction = $scope->getFunction();
if ($inFunction !== null) {
$closureThisParameters = [];
foreach ($inFunction->getParameters() as $parameter) {
if ($parameter->getClosureThisType() === null) {
continue;
}
$closureThisParameters[$parameter->getName()] = $parameter->getClosureThisType();
}
if (array_key_exists($closureBindToVar->name, $closureThisParameters)) {
if ($scope->hasExpressionType(new ParameterVariableOriginalValueExpr($closureBindToVar->name))->yes()) {
$acceptor = $parametersAcceptors[0];
$parameters = $acceptor->getParameters();
$parameters[0] = new NativeParameterReflection(
$parameters[0]->getName(),
$parameters[0]->isOptional(),
$closureThisParameters[$closureBindToVar->name],
$parameters[0]->passedByReference(),
$parameters[0]->isVariadic(),
$parameters[0]->getDefaultValue(),
);
$parametersAcceptors = [
new FunctionVariant(
$acceptor->getTemplateTypeMap(),
$acceptor->getResolvedTemplateTypeMap(),
$parameters,
$acceptor->isVariadic(),
$acceptor->getReturnType(),
$acceptor instanceof ExtendedParametersAcceptor ? $acceptor->getCallSiteVarianceMap() : TemplateTypeVarianceMap::createEmpty(),
),
];
}
}
}
}
}

if (
$args[0]->getAttribute(ClosureBindArgVisitor::ATTRIBUTE_NAME) !== null
&& $args[0]->value instanceof Node\Expr\Variable
&& is_string($args[0]->value->name)
) {
$closureVarName = $args[0]->value->name;
$closureBindToVar = $args[0]->getAttribute(ClosureBindToVarVisitor::ATTRIBUTE_NAME);
if (
$closureBindToVar !== null
&& $closureBindToVar instanceof Node\Expr\Variable
&& is_string($closureBindToVar->name)
) {
$varType = $scope->getType($closureBindToVar);
if ((new ObjectType(Closure::class))->isSuperTypeOf($varType)->yes()) {
$inFunction = $scope->getFunction();
if ($inFunction !== null) {
$closureThisParameters = [];
Expand All @@ -326,23 +282,23 @@ public static function selectFromArgs(
}
$closureThisParameters[$parameter->getName()] = $parameter->getClosureThisType();
}
if (array_key_exists($closureVarName, $closureThisParameters)) {
if ($scope->hasExpressionType(new ParameterVariableOriginalValueExpr($closureVarName))->yes()) {
if (array_key_exists($closureBindToVar->name, $closureThisParameters)) {
if ($scope->hasExpressionType(new ParameterVariableOriginalValueExpr($closureBindToVar->name))->yes()) {
$acceptor = $parametersAcceptors[0];
$parameters = $acceptor->getParameters();
$parameters[1] = new NativeParameterReflection(
$parameters[1]->getName(),
$parameters[1]->isOptional(),
$closureThisParameters[$closureVarName],
$parameters[1]->passedByReference(),
$parameters[1]->isVariadic(),
$parameters[1]->getDefaultValue(),
$parameters[0] = new NativeParameterReflection(
$parameters[0]->getName(),
$parameters[0]->isOptional(),
$closureThisParameters[$closureBindToVar->name],
$parameters[0]->passedByReference(),
$parameters[0]->isVariadic(),
$parameters[0]->getDefaultValue(),
);
$parametersAcceptors = [
new FunctionVariant(
$acceptor->getTemplateTypeMap(),
$acceptor->getResolvedTemplateTypeMap(),
array_values($parameters),
$parameters,
$acceptor->isVariadic(),
$acceptor->getReturnType(),
$acceptor instanceof ExtendedParametersAcceptor ? $acceptor->getCallSiteVarianceMap() : TemplateTypeVarianceMap::createEmpty(),
Expand All @@ -353,6 +309,48 @@ public static function selectFromArgs(
}
}
}

if (
$args[0]->getAttribute(ClosureBindArgVisitor::ATTRIBUTE_NAME) !== null
&& $args[0]->value instanceof Node\Expr\Variable
&& is_string($args[0]->value->name)
) {
$closureVarName = $args[0]->value->name;
$inFunction = $scope->getFunction();
if ($inFunction !== null) {
$closureThisParameters = [];
foreach ($inFunction->getParameters() as $parameter) {
if ($parameter->getClosureThisType() === null) {
continue;
}
$closureThisParameters[$parameter->getName()] = $parameter->getClosureThisType();
}
if (array_key_exists($closureVarName, $closureThisParameters)) {
if ($scope->hasExpressionType(new ParameterVariableOriginalValueExpr($closureVarName))->yes()) {
$acceptor = $parametersAcceptors[0];
$parameters = $acceptor->getParameters();
$parameters[1] = new NativeParameterReflection(
$parameters[1]->getName(),
$parameters[1]->isOptional(),
$closureThisParameters[$closureVarName],
$parameters[1]->passedByReference(),
$parameters[1]->isVariadic(),
$parameters[1]->getDefaultValue(),
);
$parametersAcceptors = [
new FunctionVariant(
$acceptor->getTemplateTypeMap(),
$acceptor->getResolvedTemplateTypeMap(),
array_values($parameters),
$acceptor->isVariadic(),
$acceptor->getReturnType(),
$acceptor instanceof ExtendedParametersAcceptor ? $acceptor->getCallSiteVarianceMap() : TemplateTypeVarianceMap::createEmpty(),
),
];
}
}
}
}
}

if (count($parametersAcceptors) === 1) {
Expand Down
Loading