Improve support switch on ::class#4011
Merged
ondrejmirtes merged 1 commit intophpstan:2.1.xfrom Jul 17, 2025
Merged
Conversation
VincentLanglet
commented
May 24, 2025
| if ( | ||
| $leftType instanceof ConstantScalarType | ||
| && !$rightExpr instanceof ConstFetch | ||
| && !$rightExpr instanceof ClassConstFetch |
Contributor
Author
There was a problem hiding this comment.
The findTypeExpressionFromBinaryOperation is used two times:
- Inside resolveIdentical
- Inside resolveEqual
Inside resolveIdentical the ClassConstFetch scenario is not needed. But removing the check does not have impact since then the following code
$expressions = $this->findTypeExpressionsFromBinaryOperation($scope, $expr);
if ($expressions !== null) {
$exprNode = $expressions[0];
$constantType = $expressions[1];
$unwrappedExprNode = $exprNode;
if ($exprNode instanceof AlwaysRememberedExpr) {
$unwrappedExprNode = $exprNode->getExpr();
}
$specifiedType = $this->specifyTypesForConstantBinaryExpression($unwrappedExprNode, $constantType, $context, $scope, $expr);
gives a NULL $specifiedType.
Inside resolveEqual the ClassConstFetch is needed for an easy check
$context->true()
&& $exprNode instanceof ClassConstFetch
&& $exprNode->name instanceof Node\Identifier
&& strtolower($exprNode->name->toString()) === 'class'
&& $constantType->isString()->yes()
without checking both the right side and the left side.
Not sure if you're ok with such change.
I could had a boolean parameter to remove or not the ClassConstFetch check but I'm not sure it's worth it.
Member
|
Thank you. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes phpstan/phpstan#13069