Skip to content

Commit 6a6bc3c

Browse files
committed
simplify code
1 parent 60fdbfd commit 6a6bc3c

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

src/Analyser/TypeSpecifier.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,7 +1543,7 @@ private function specifyTypesFromConditionalReturnType(
15431543
return null;
15441544
}
15451545

1546-
$argsMap = [];
1546+
$argumentExpr = null;
15471547
$parameters = $parametersAcceptor->getParameters();
15481548
foreach ($call->getArgs() as $i => $arg) {
15491549
if ($arg->unpack) {
@@ -1558,29 +1558,29 @@ private function specifyTypesFromConditionalReturnType(
15581558
continue;
15591559
}
15601560

1561-
$argsMap['$' . $paramName] = $arg->value;
1561+
if ('$'. $paramName !== $returnType->getParameterName()) {
1562+
continue;
1563+
}
1564+
1565+
$argumentExpr = $arg->value;
1566+
break;
1567+
}
1568+
1569+
if ($argumentExpr === null) {
1570+
return null;
15621571
}
15631572

1564-
return $this->getConditionalSpecifiedTypes($returnType, $leftType, $rightType, $scope, $argsMap);
1573+
return $this->getConditionalSpecifiedTypes($returnType, $leftType, $rightType, $scope, $argumentExpr);
15651574
}
15661575

1567-
/**
1568-
* @param array<string, Expr> $argsMap
1569-
*/
15701576
private function getConditionalSpecifiedTypes(
15711577
ConditionalTypeForParameter $conditionalType,
15721578
Type $leftType,
15731579
Type $rightType,
15741580
Scope $scope,
1575-
array $argsMap,
1581+
Expr $argumentExpr,
15761582
): ?SpecifiedTypes
15771583
{
1578-
$parameterName = $conditionalType->getParameterName();
1579-
if (!array_key_exists($parameterName, $argsMap)) {
1580-
return null;
1581-
}
1582-
$argumentExpr = $argsMap[$parameterName];
1583-
15841584
$targetType = $conditionalType->getTarget();
15851585
$ifType = $conditionalType->getIf();
15861586
$elseType = $conditionalType->getElse();

0 commit comments

Comments
 (0)