Skip to content

Commit 0f990bb

Browse files
committed
Merge branch '3.1'
* 3.1: prefer getSourceContext() over getSource() [HttpFoundation] Avoid implicit null to array conversion in request matcher Revert "bug #20184 [FrameworkBundle] Convert null prefix to an empty string in translation:update (chalasr)" Update UPGRADE-2.7.md
2 parents 152611b + 4a8b7cf commit 0f990bb

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Command/TranslationUpdateCommand.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
132132
// load any messages from templates
133133
$extractedCatalogue = new MessageCatalogue($input->getArgument('locale'));
134134
$io->comment('Parsing templates...');
135-
$prefix = $input->getOption('prefix');
136135
$extractor = $this->getContainer()->get('translation.extractor');
137-
$extractor->setPrefix(null === $prefix ? '' : $prefix);
136+
$extractor->setPrefix($input->getOption('prefix'));
138137
foreach ($transPaths as $path) {
139138
$path .= 'views';
140139
if (is_dir($path)) {

0 commit comments

Comments
 (0)