Skip to content

Fix late static binding calls for first class callable #3435

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

Merged
merged 10 commits into from
Sep 19, 2024
Merged

Fix late static binding calls for first class callable #3435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7427d1a
Fix late static binding calls for first class callable
mvorisek Sep 12, 2024
0936b0b
fix
mvorisek Sep 12, 2024
ae38fdd
dedup
mvorisek Sep 12, 2024
ba3b76a
adjust tests
mvorisek Sep 12, 2024
1fbd8a0
fix private method name
mvorisek Sep 12, 2024
02bad38
fix typo
mvorisek Sep 12, 2024
6872cdf
fix cs
mvorisek Sep 12, 2024
f59a834
fix typo
mvorisek Sep 12, 2024
8993af5
reorg test
mvorisek Sep 12, 2024
e2af2f6
add issue URL to tests
mvorisek Sep 12, 2024
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
50 changes: 23 additions & 27 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,7 @@ private function resolveType(string $exprString, Expr $node): Type
return new ObjectType(Closure::class);
}

$classType = $this->resolveTypeByName($node->class);
$classType = $this->resolveTypeByNameWithLateStaticBinding($node->class, $node->name);
$methodName = $node->name->toString();
if (!$classType->hasMethod($methodName)->yes()) {
return new ObjectType(Closure::class);
Expand Down Expand Up @@ -2082,19 +2082,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
if ($this->nativeTypesPromoted) {
$typeCallback = function () use ($node): Type {
if ($node->class instanceof Name) {
$staticMethodCalledOnType = $this->resolveTypeByName($node->class);
if (
$staticMethodCalledOnType instanceof StaticType
&& !in_array($node->class->toLowerString(), ['self', 'static', 'parent'], true)
) {
$methodReflectionCandidate = $this->getMethodReflection(
$staticMethodCalledOnType,
$node->name->name,
);
if ($methodReflectionCandidate !== null && $methodReflectionCandidate->isStatic()) {
$staticMethodCalledOnType = $staticMethodCalledOnType->getStaticObjectType();
}
}
$staticMethodCalledOnType = $this->resolveTypeByNameWithLateStaticBinding($node->class, $node->name);
} else {
$staticMethodCalledOnType = $this->getNativeType($node->class);
}
Expand All @@ -2119,19 +2107,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu

$typeCallback = function () use ($node): Type {
if ($node->class instanceof Name) {
$staticMethodCalledOnType = $this->resolveTypeByName($node->class);
if (
$staticMethodCalledOnType instanceof StaticType
&& !in_array($node->class->toLowerString(), ['self', 'static', 'parent'], true)
) {
$methodReflectionCandidate = $this->getMethodReflection(
$staticMethodCalledOnType,
$node->name->name,
);
if ($methodReflectionCandidate !== null && $methodReflectionCandidate->isStatic()) {
$staticMethodCalledOnType = $staticMethodCalledOnType->getStaticObjectType();
}
}
$staticMethodCalledOnType = $this->resolveTypeByNameWithLateStaticBinding($node->class, $node->name);
} else {
$staticMethodCalledOnType = TypeCombinator::removeNull($this->getType($node->class))->getObjectTypeOrClassStringObjectType();
}
Expand Down Expand Up @@ -2780,6 +2756,26 @@ public function resolveTypeByName(Name $name): TypeWithClassName
return new ObjectType($originalClass);
}

private function resolveTypeByNameWithLateStaticBinding(Name $class, Node\Identifier $name): TypeWithClassName
{
$classType = $this->resolveTypeByName($class);

if (
$classType instanceof StaticType
&& !in_array($class->toLowerString(), ['self', 'static', 'parent'], true)
) {
$methodReflectionCandidate = $this->getMethodReflection(
$classType,
$name->name,
);
if ($methodReflectionCandidate !== null && $methodReflectionCandidate->isStatic()) {
$classType = $classType->getStaticObjectType();
}
}

return $classType;
}

/**
* @api
* @param mixed $value
Expand Down
17 changes: 13 additions & 4 deletions tests/PHPStan/Analyser/nsrt/static-late-binding.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function foo(): void
assertType('int', parent::retStaticConst());
assertType('2', $this->retStaticConst());
assertType('bool', X::retStaticConst());
assertType('*ERROR*', $clUnioned->retStaticConst()); // should be bool|int
assertType('*ERROR*', $clUnioned->retStaticConst()); // should be bool|int https://github.com/phpstan/phpstan/issues/11687

assertType('int', A::retStaticConst(...)());
assertType('2', B::retStaticConst(...)());
Expand All @@ -76,7 +76,7 @@ public function foo(): void
assertType('int', parent::retStaticConst(...)());
assertType('2', $this->retStaticConst(...)());
assertType('bool', X::retStaticConst(...)());
assertType('mixed', $clUnioned->retStaticConst(...)()); // should be bool|int
assertType('mixed', $clUnioned->retStaticConst(...)()); // should be bool|int https://github.com/phpstan/phpstan/issues/11687

assertType('StaticLateBinding\A', A::retStatic());
assertType('StaticLateBinding\B', B::retStatic());
Expand All @@ -85,7 +85,16 @@ public function foo(): void
assertType('static(StaticLateBinding\B)', parent::retStatic());
assertType('static(StaticLateBinding\B)', $this->retStatic());
assertType('bool', X::retStatic());
assertType('bool|StaticLateBinding\A|StaticLateBinding\X', $clUnioned::retStatic()); // should be bool|StaticLateBinding\A
assertType('bool|StaticLateBinding\A|StaticLateBinding\X', $clUnioned::retStatic()); // should be bool|StaticLateBinding\A https://github.com/phpstan/phpstan/issues/11687

assertType('StaticLateBinding\A', A::retStatic(...)());
assertType('StaticLateBinding\B', B::retStatic(...)());
assertType('static(StaticLateBinding\B)', self::retStatic(...)());
assertType('static(StaticLateBinding\B)', static::retStatic(...)());
assertType('static(StaticLateBinding\B)', parent::retStatic(...)());
assertType('static(StaticLateBinding\B)', $this->retStatic(...)());
assertType('bool', X::retStatic(...)());
assertType('mixed', $clUnioned::retStatic(...)()); // should be bool|StaticLateBinding\A https://github.com/phpstan/phpstan/issues/11687

assertType('static(StaticLateBinding\B)', A::retNonStatic());
assertType('static(StaticLateBinding\B)', B::retNonStatic());
Expand All @@ -94,7 +103,7 @@ public function foo(): void
assertType('static(StaticLateBinding\B)', parent::retNonStatic());
assertType('static(StaticLateBinding\B)', $this->retNonStatic());
assertType('bool', X::retNonStatic());
assertType('*ERROR*', $clUnioned->retNonStatic()); // should be bool|static(StaticLateBinding\B)
assertType('*ERROR*', $clUnioned->retNonStatic()); // should be bool|static(StaticLateBinding\B) https://github.com/phpstan/phpstan/issues/11687

A::outStaticConst($v);
assertType('int', $v);
Expand Down
Loading