feature #23161 [FrameworkBundle] Deprecate useless --no-prefix option (chalasr)

fabpot · fabpot · commit 5198e224f7c6 · 2017-06-13T22:09:10.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] Deprecate useless --no-prefix option | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a It was a workaround, not needed since symfony/symfony#21228. Let's deprecate it and remove it in 4.0. Commits ------- f7afa777d8 [FrameworkBundle] Deprecate useless --no-prefix option
diff --git a/Command/TranslationUpdateCommand.php b/Command/TranslationUpdateCommand.php
@@ -39,7 +39,7 @@ protected function configure()
                 new InputArgument('locale', InputArgument::REQUIRED, 'The locale'),
                 new InputArgument('bundle', InputArgument::OPTIONAL, 'The bundle name or directory where to load the messages, defaults to app/Resources folder'),
                 new InputOption('prefix', null, InputOption::VALUE_OPTIONAL, 'Override the default prefix', '__'),
-                new InputOption('no-prefix', null, InputOption::VALUE_NONE, 'If set, no prefix is added to the translations'),
+                new InputOption('no-prefix', null, InputOption::VALUE_NONE, '[DEPRECATED] If set, no prefix is added to the translations'),
                 new InputOption('output-format', null, InputOption::VALUE_OPTIONAL, 'Override the default output format', 'yml'),
                 new InputOption('dump-messages', null, InputOption::VALUE_NONE, 'Should the messages be dumped in the console'),
                 new InputOption('force', null, InputOption::VALUE_NONE, 'Should the update be done'),
@@ -135,7 +135,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $extractedCatalogue = new MessageCatalogue($input->getArgument('locale'));
         $errorIo->comment('Parsing templates...');
         $extractor = $this->getContainer()->get('translation.extractor');
-        $extractor->setPrefix($input->getOption('no-prefix') ? '' : $input->getOption('prefix'));
+        $prefix = $input->getOption('prefix');
+        // @deprecated since version 3.4, to be removed in 4.0 along with the --no-prefix option
+        if ($input->getOption('no-prefix')) {
+            @trigger_error('The "--no-prefix" option is deprecated since version 3.4 and will be removed in 4.0. Use the "--prefix" option with an empty string as value instead.', E_USER_DEPRECATED);
+            $prefix = '';
+        }
+        $extractor->setPrefix($prefix);
         foreach ($transPaths as $path) {
             $path .= 'views';
             if (is_dir($path)) {
