From 20e8c37f90c2705ebcbf6d142fe62562669320cf Mon Sep 17 00:00:00 2001
From: mboultoureau <contact@mboultoureau.com>
Date: Sat, 28 Oct 2023 00:15:46 +0200
Subject: [PATCH] [FrameworkBundle] Add support for `--sort` option for
 `--force` option with `translation:extract` command

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  1 +
 .../Command/TranslationUpdateCommand.php      | 32 +++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index ed3b53d14ac42..03c2a685903da 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -36,6 +36,7 @@ CHANGELOG
 6.4
 ---
 
+ * Add support for `--sort` option for `--force` option with `translation:extract` command
  * Add `HttpClientAssertionsTrait`
  * Add `AbstractController::renderBlock()` and `renderBlockView()`
  * Add native return type to `Translator` and to `Application::reset()`
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
index bf2c0ec8fd179..20d4ad4391305 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -87,7 +87,7 @@ protected function configure(): void
                 new InputOption('force', null, InputOption::VALUE_NONE, 'Should the extract be done'),
                 new InputOption('clean', null, InputOption::VALUE_NONE, 'Should clean not found messages'),
                 new InputOption('domain', null, InputOption::VALUE_OPTIONAL, 'Specify the domain to extract'),
-                new InputOption('sort', null, InputOption::VALUE_OPTIONAL, 'Return list of messages sorted alphabetically (only works with --dump-messages)', 'asc'),
+                new InputOption('sort', null, InputOption::VALUE_OPTIONAL, 'Return list of messages sorted alphabetically', 'asc'),
                 new InputOption('as-tree', null, InputOption::VALUE_OPTIONAL, 'Dump the messages as a tree-like structure: The given value defines the level where to switch to inline YAML'),
             ])
             ->setHelp(<<<'EOF'
@@ -277,7 +277,35 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $bundleTransPath = end($transPaths);
             }
 
-            $this->writer->write($operation->getResult(), $format, ['path' => $bundleTransPath, 'default_locale' => $this->defaultLocale, 'xliff_version' => $xliffVersion, 'as_tree' => $input->getOption('as-tree'), 'inline' => $input->getOption('as-tree') ?? 0]);
+            $catalogue = $operation->getResult();
+            if ($sort = $input->getOption('sort')) {
+                $sort = strtolower($sort);
+                if (!\in_array($sort, self::SORT_ORDERS, true)) {
+                    $errorIo->error(['Wrong sort order', 'Supported formats are: '.implode(', ', self::SORT_ORDERS).'.']);
+
+                    return 1;
+                }
+
+                foreach ($catalogue->getDomains() as $domain) {
+                    $intlDomain = $domain.MessageCatalogue::INTL_DOMAIN_SUFFIX;
+                    $intlMessages = $catalogue->all($intlDomain);
+
+                    if (!$intlMessages) {
+                        $intlDomain = $domain;
+                        $intlMessages = $catalogue->all($domain);
+                    }
+
+                    if (self::DESC === $sort) {
+                        krsort($intlMessages);
+                    } else {
+                        ksort($intlMessages);
+                    }
+
+                    $catalogue->replace($intlMessages, $intlDomain);
+                }
+            }
+
+            $this->writer->write($catalogue, $format, ['path' => $bundleTransPath, 'default_locale' => $this->defaultLocale, 'xliff_version' => $xliffVersion, 'as_tree' => $input->getOption('as-tree'), 'inline' => $input->getOption('as-tree') ?? 0]);
 
             if (true === $input->getOption('dump-messages')) {
                 $resultMessage .= ' and translation files were updated';