Skip to content

Commit 4726638

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: 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 f359835 + 9a2d2c4 commit 4726638

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
@@ -119,9 +119,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
119119
// load any messages from templates
120120
$extractedCatalogue = new MessageCatalogue($input->getArgument('locale'));
121121
$io->comment('Parsing templates...');
122-
$prefix = $input->getOption('prefix');
123122
$extractor = $this->getContainer()->get('translation.extractor');
124-
$extractor->setPrefix(null === $prefix ? '' : $prefix);
123+
$extractor->setPrefix($input->getOption('prefix'));
125124
foreach ($transPaths as $path) {
126125
$path .= 'views';
127126
if (is_dir($path)) {

0 commit comments

Comments
 (0)