Repository navigation
fix: sort generator imports in templates with CRLF line endings - #10622
Merged
paulbalandan merged 1 commit intoOct 13, 2026
Merged
Conversation
michalsn
approved these changes
Oct 12, 2026
4 of 5 tasks
paulbalandan
force-pushed
the
crlf-import-sorting
branch
from
October 13, 2026 05:40
dcdebc5 to
1bf4082
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.
Description
GeneratorTrait::buildContent()finds the import block with/(?:^use [^;]+;$\n?)+/m. In multiline mode$only matches before\n, so on a template with CRLF line endings the\rafter each;breaks the match and the imports are left unsorted. This hits custom generator views set inConfig\Generators::$viewsand saved with CRLF, for example on Windows.The pattern now allows
\r?before the line end. The imports are split on normalized\nand rejoined with the template's own line ending, so CRLF output stays CRLF.The
publish:languagetest fixture gains a--crlfflag that converts its template to CRLF, andConfigurableSortImportsTestcovers the sorted CRLF output. A follow-up PR on4.8applies the same fix toAbstractGeneratorCommand.Checklist: