Skip to content

[FrameworkBundle] Convert null prefix to an empty string in translation:update #20184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2016
Merged

[FrameworkBundle] Convert null prefix to an empty string in translation:update #20184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
// load any messages from templates
$extractedCatalogue = new MessageCatalogue($input->getArgument('locale'));
$output->text('Parsing templates');
$prefix = $input->getOption('prefix');
Copy link

@navitronic navitronic Oct 27, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe I am misunderstanding this, but $prefix can never be assigned with a null value here. If it were null, shouldn't it return the default value of __ specified on L40?

Which would mean that the following ternary never returns an empty string.

Copy link
Member Author

@chalasr chalasr Nov 6, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, you're right.

In fact the issue is actually quite complex, the current implementation makes impossible to detectt if an option has been set with an empty string, it's always parsed as null, so it's impossible get an empty value for an option with VALUE_OPTIONAL and a default value, because if it is null, the default value is used (the case without default value has been fixed in #19946). We would need to differentiate if an option has been set without any value or with an empty value ("") and I don't think we should make this difference as it would be really hard to do it backward compatible, some use cases would be broken for having this one working (empty strings are converted to null, it is the expected behavior and it is tested).

$extractor = $this->getContainer()->get('translation.extractor');
$extractor->setPrefix($input->getOption('prefix'));
$extractor->setPrefix(null === $prefix ? '' : $prefix);
foreach ($transPaths as $path) {
$path .= 'views';
if (is_dir($path)) {
Expand Down