Skip to content

Commit 6961932

Browse files
authored
Merge branch refs/heads/1.12.x into 2.0.x
2 parents e7652ad + 00d2caf commit 6961932

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

src/Analyser/NodeScopeResolver.php

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4578,20 +4578,18 @@ private function processArgs(
45784578

45794579
$lookForUnset = false;
45804580
if ($assignByReference) {
4581-
if ($arg->value instanceof Variable) {
4582-
$isBuiltin = false;
4583-
if ($calleeReflection instanceof FunctionReflection && $calleeReflection->isBuiltin()) {
4584-
$isBuiltin = true;
4585-
} elseif ($calleeReflection instanceof ExtendedMethodReflection && $calleeReflection->getDeclaringClass()->isBuiltin()) {
4586-
$isBuiltin = true;
4587-
}
4588-
if (
4589-
$isBuiltin
4590-
|| ($parameterNativeType === null || !$parameterNativeType->isNull()->no())
4591-
) {
4592-
$scope = $this->lookForSetAllowedUndefinedExpressions($scope, $arg->value);
4593-
$lookForUnset = true;
4594-
}
4581+
$isBuiltin = false;
4582+
if ($calleeReflection instanceof FunctionReflection && $calleeReflection->isBuiltin()) {
4583+
$isBuiltin = true;
4584+
} elseif ($calleeReflection instanceof ExtendedMethodReflection && $calleeReflection->getDeclaringClass()->isBuiltin()) {
4585+
$isBuiltin = true;
4586+
}
4587+
if (
4588+
$isBuiltin
4589+
|| ($parameterNativeType === null || !$parameterNativeType->isNull()->no())
4590+
) {
4591+
$scope = $this->lookForSetAllowedUndefinedExpressions($scope, $arg->value);
4592+
$lookForUnset = true;
45954593
}
45964594
}
45974595

0 commit comments

Comments
 (0)