Repository navigation
Include as-alias in blink OrderedImports sort key - #214
Merged
Merged
Conversation
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.
blink's OrderedImports built its alphabetical sort key from the imported path only, breaking at
as. PHP-CS-Fixer'sOrderedImportsFixerincludes theas <alias>suffix in the key (its namespace string, with\mapped to a separator).So for two imports of the same class, one aliased:
both reduced to the same key in blink, a stable sort kept their order, and blink skipped a reorder that PHP applies. PHP sorts the plain import before the aliased one (its key is a prefix of the aliased key).
Fix: the sort key now includes the
as <alias>suffix. Backslashes and whitespace both map to\x00as the shared separator, so\and the space beforeassort before any identifier character, matching PHP's space-separator comparison. For imports without an alias the key is byte-identical to before, so only aliased imports change.Covered by
TestOrderedImportsAliasInSortKey.