Skip to content

Commit c84732e

Browse files
Merge branch '2.7' into 2.8
* 2.7: CS fixes Remove trailing space CS: apply rules [Yaml] Clean some messages + add test case [Form] Fix UrlType transforms valid protocols [SecurityBundle] Changed encoder configuration example to bcrypt
2 parents cca6ff8 + c2285c1 commit c84732e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dumper/IcuResFileDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
4444

4545
foreach ($messages->all($domain) as $source => $target) {
4646
$indexes .= pack('v', strlen($data) + 28);
47-
$data .= $source."\0";
47+
$data .= $source."\0";
4848
}
4949

5050
$data .= $this->writePadding($data);

Translator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,9 @@ private function getFallbackContent(MessageCatalogue $catalogue)
380380
$fallbackSuffix = ucfirst(preg_replace($replacementPattern, '_', $fallback));
381381
$currentSuffix = ucfirst(preg_replace($replacementPattern, '_', $current));
382382

383-
$fallbackContent .= sprintf(<<<EOF
384-
\$catalogue%s = new MessageCatalogue('%s', %s);
385-
\$catalogue%s->addFallbackCatalogue(\$catalogue%s);
383+
$fallbackContent .= sprintf(<<<'EOF'
384+
$catalogue%s = new MessageCatalogue('%s', %s);
385+
$catalogue%s->addFallbackCatalogue($catalogue%s);
386386

387387
EOF
388388
,

0 commit comments

Comments
 (0)