Skip to content

ConstantArrayType: fix returned ConstantArrayTypeAndMethod #3372

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 2 commits into from
Jan 4, 2025
Merged

ConstantArrayType: fix returned ConstantArrayTypeAndMethod #3372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a004e8
ConstantArrayType: fix returned ConstantArrayTypeAndMethod
janedbal Aug 30, 2024
dd1184a
Add test
janedbal Dec 27, 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
3 changes: 2 additions & 1 deletion src/Type/Constant/ConstantArrayType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@ public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope)
}

$method = $typeAndMethodName->getType()
->getObjectTypeOrClassStringObjectType()
->getMethod($typeAndMethodName->getMethod(), $scope);

if (!$scope->canCallMethod($method)) {
Expand Down Expand Up @@ -567,7 +568,7 @@ public function findTypeAndMethodNames(): array
$has = $has->and(TrinaryLogic::createMaybe());
}

$typeAndMethods[] = ConstantArrayTypeAndMethod::createConcrete($type, $method->getValue(), $has);
$typeAndMethods[] = ConstantArrayTypeAndMethod::createConcrete($classOrObject, $method->getValue(), $has);
}

return $typeAndMethods;
Expand Down
30 changes: 30 additions & 0 deletions tests/PHPStan/Type/Constant/ConstantArrayTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,4 +1051,34 @@ public function testValuesArray(ConstantArrayType $type, ConstantArrayType $expe
$this->assertSame($expectedType->getNextAutoIndexes(), $actualType->getNextAutoIndexes());
}

public function testFindTypeAndMethodNames(): void
{
$classStringArray = new ConstantArrayType([
new ConstantIntegerType(0),
new ConstantIntegerType(1),
], [
new ConstantStringType(Closure::class, true),
new ConstantStringType('bind'),
]);
$objectArray = new ConstantArrayType([
new ConstantIntegerType(0),
new ConstantIntegerType(1),
], [
new ObjectType(Closure::class, null, $this->createReflectionProvider()->getClass(Closure::class)),
new ConstantStringType('bind'),
]);

$classStringResult = $classStringArray->findTypeAndMethodNames();
$objectResult = $objectArray->findTypeAndMethodNames();

$this->assertCount(1, $classStringResult);
$this->assertCount(1, $objectResult);
$this->assertInstanceOf(ConstantStringType::class, $classStringResult[0]->getType());
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Without the fix, this is still just ObjectType here.

$this->assertInstanceOf(ObjectType::class, $objectResult[0]->getType());
$this->assertSame('bind', $classStringResult[0]->getMethod());
$this->assertSame('bind', $objectResult[0]->getMethod());
$this->assertSame(TrinaryLogic::createYes(), $classStringResult[0]->getCertainty());
$this->assertSame(TrinaryLogic::createYes(), $objectResult[0]->getCertainty());
}

}
Loading