Repository navigation
[CodeQuality] Extract NullableObjectToInstanceofFactory shared by nullable-object instanceof rules - #8633
Merged
Conversation
…lable-object instanceof rules
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
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.
Four rules independently built the same
$expr instanceof Xnode from a nullableObjectType, each with its own private helper:ObjectExplicitBoolCompareRector-resolveNullable()FlipTypeControlToUseExclusiveTypeRector-processConvertToExclusiveType()BinaryOpNullableToInstanceofRector-createExprInstanceof()WhileNullableToInstanceofRector-createInstanceof()This extracts the shared node construction into
NullableObjectToInstanceofFactory::create(Expr, ObjectType, bool $isNegated)and migrates all four rules to it. The factory keeps theShortenedObjectType/AliasedObjectTypeFQCN handling fromFlipTypeControl- the other callers never hit those branches, so behavior is unchanged.Only node construction is shared. Each rule keeps its own type-resolution path (
nodeTypeResolver,nullableTypeAnalyzer, native scope type), since those differ in depth and source and are sensitive to resolution order.EmptyOnNullableObjectToInstanceOfRectoris intentionally left out - it maps the type throughStaticTypeMapperto aNamerather than building aFullyQualifiedfrom the class name.Rules stay separate on purpose: they match different input idioms (
!$item,$item === null,&&/||,while) and converge on the same output.No behavior change. Fixtures untouched, all pass.