Repository navigation
Make RemoveNullFromNullableCollectionTypeRector idempotent - #534
Merged
Merged
Conversation
When the native property type is nullable, unwrapping it leaves a property matching the docblock-cleaning branch, so a later pass would rewrite the still-nullable docblock. Skip that branch when the original native type was nullable, detected via the original node.
TomasVotruba
force-pushed
the
tv-doctrine-idempotent
branch
from
October 18, 2026 14:50
be5898c to
316868b
Compare
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.
When the native property type is nullable (
?Collection), the rule unwraps it and leaves the docblock as-is. The resulting property - non-nullable nativeCollectionwith a@var ...|nulldocblock - is structurally identical to the docblock-cleaning branch's input, so running the rule again would rewrite that docblock (dropping|null).The two cases are told apart by the original node: when the original native type was nullable, the unwrap branch owns the property and the docblock branch is skipped. This keeps the rule idempotent without changing any fixture, and leaves the three genuine docblock-cleaning fixtures untouched.
Harmless today, but the upcoming rector-src node-traverser simplification drops the created-by-rule reprocessing guard, so each rule must settle on its own.
Rule test, ECS and PHPStan pass.