Skip to content

Commit ee2ea9d

Browse files
Merge branch '3.4' into 4.2
* 3.4: cs fix cs fix [PHPUnit-Bridge] override some environment variables [TwigBridge] Remove use spaceless tag [translation] Update defaut format from yml to yaml Change default log level for output streams update docblock to match the actual behavior compatibility with phpunit8 [Debug][DebugClassLoader] Detect annotations before blank docblock lines on final and internal methods Added translations for chineese language.
2 parents 896bc24 + e862df9 commit ee2ea9d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Command/TranslationUpdateCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private function createCommandTester($extractedMessages = [], $loadedMessages =
159159
->expects($this->any())
160160
->method('getFormats')
161161
->will(
162-
$this->returnValue(['xlf', 'yml'])
162+
$this->returnValue(['xlf', 'yml', 'yaml'])
163163
);
164164

165165
if (null === $kernel) {

0 commit comments

Comments
 (0)