fix: sort generator imports in templates with CRLF line endings

Author: paulbalandan

system/CLI/GeneratorTrait.php

@@ -399,15 +399,16 @@ protected function buildContent(string $class): string
         if (
             $this->sortImports
             && preg_match(
-                '/(?P<imports>(?:^use [^;]+;$\n?)+)/m',
+                '/(?P<imports>(?:^use [^;]+;\r?$\n?)+)/m',
                 $template,
                 $match,
             )
         ) {
-            $imports = explode("\n", trim($match['imports']));
+            $eol     = str_contains($match['imports'], "\r\n") ? "\r\n" : "\n";
+            $imports = explode("\n", str_replace("\r\n", "\n", trim($match['imports'])));
             sort($imports);
 
-            return str_replace(trim($match['imports']), implode("\n", $imports), $template);
+            return str_replace(trim($match['imports']), implode($eol, $imports), $template);
         }
 
         return $template;

tests/_support/Commands/LanguageCommand.php

@@ -27,6 +27,7 @@ class LanguageCommand extends BaseCommand
     protected $options     = [
         '--lang' => 'The language folder to save the file.',
         '--sort' => 'Turn on/off the sortImports flag.',
+        '--crlf' => 'Use CRLF line endings in the template.',
     ];
 
     public function run(array $params): void
@@ -46,6 +47,8 @@ public function run(array $params): void
 
     protected function prepare(string $class): string
     {
-        return file_get_contents(__DIR__ . '/Foobar.php') ?: '';
+        $template = file_get_contents(__DIR__ . '/Foobar.php') ?: '';
+
+        return $this->getOption('crlf') === true ? str_replace("\n", "\r\n", $template) : $template;
     }
 }

tests/system/Commands/ConfigurableSortImportsTest.php

@@ -55,6 +55,25 @@ public function testEnabledSortImportsWillDisruptLanguageFilePublish(): void
         }
     }
 
+    public function testSortImportsKeepsCrlfLineEndings(): void
+    {
+        command('publish:language --lang fr --crlf');
+
+        $file = APPPATH . 'Language/fr/Foobar.php';
+        $this->assertFileExists($file);
+        $this->assertStringContainsString(
+            "\r\n\r\nuse CodeIgniter\\CLI\\CLI;\r\nuse Config\\App;\r\n\r\n",
+            (string) file_get_contents($file),
+        );
+        if (is_file($file)) {
+            unlink($file);
+        }
+        $dir = dirname($file);
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
+    }
+
     public function testDisabledSortImportsWillNotAffectLanguageFilesPublish(): void
     {
         command('publish:language --lang ar --sort off');

user_guide_src/source/changelogs/v4.7.6.rst

@@ -30,6 +30,8 @@ Deprecations
 Bugs Fixed
 **********
 
+- **Commands:** Fixed a bug where generator commands did not sort the imports of a template with CRLF line endings.
+
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
 for a complete list of bugs fixed.