bug #35486 [Translator] Default value for 'sort' option in translation:update should be 'asc' (versgui)

fabpot · fabpot · commit 55df55e4f65f · 2020-01-30T17:24:07.000+01:00
This PR was squashed before being merged into the 4.4 branch (closes #35486). Discussion ---------- [Translator] Default value for 'sort' option in translation:update should be 'asc' | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | The value for 'sort' option for `bin/console translation:update --sort` is optional, but no default value is defined. So the list isn't sorted if no value is explicitly defined. This MR brings a default value "asc" if no value is defined, so the list is correctly sorted. Commits ------- fdb13c8 [Translator] Default value for 'sort' option in translation:update should be 'asc'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -83,7 +83,7 @@ protected function configure()
                 new InputOption('clean', null, InputOption::VALUE_NONE, 'Should clean not found messages'),
                 new InputOption('domain', null, InputOption::VALUE_OPTIONAL, 'Specify the domain to update'),
                 new InputOption('xliff-version', null, InputOption::VALUE_OPTIONAL, 'Override the default xliff version', '1.2'),
-                new InputOption('sort', null, InputOption::VALUE_OPTIONAL, 'Return list of messages sorted alphabetically'),
+                new InputOption('sort', null, InputOption::VALUE_OPTIONAL, 'Return list of messages sorted alphabetically', 'asc'),
             ])
             ->setDescription('Updates the translation file')
             ->setHelp(<<<'EOF'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
@@ -48,6 +48,14 @@ public function testDumpReverseSortedMessagesAndClean()
         $this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay());
     }
 
+    public function testDumpSortWithoutValueAndClean()
+    {
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--sort']);
+        $this->assertRegExp("/\*bar\*foo\*test/", preg_replace('/\s+/', '', $tester->getDisplay()));
+        $this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay());
+    }
+
     public function testDumpWrongSortAndClean()
     {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,14 @@ public function testDumpReverseSortedMessagesAndClean()`
`48`	`48`	`$this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay());`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ public function testDumpSortWithoutValueAndClean()`
	`52`	`+ {`
	`53`	`+ $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);`
	`54`	`+ $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--sort']);`
	`55`	`+ $this->assertRegExp("/\bar\foo\*test/", preg_replace('/\s+/', '', $tester->getDisplay()));`
	`56`	`+ $this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay());`
	`57`	`+ }`
	`58`	`+`
`51`	`59`	`public function testDumpWrongSortAndClean()`
`52`	`60`	`{`
`53`	`61`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);`