Skip to content

Commit 580c6a7

Browse files
Merge branch '4.2'
* 4.2: (27 commits) cs fix cs fix [PHPUnit-Bridge] override some environment variables [TwigBridge] Remove use spaceless tag Upgrade zookeeper ext [translation] Update defaut format from yml to yaml Change default log level for output streams update docblock to match the actual behavior Don't resolve the Deprecation error handler mode until a deprecation is triggered compatibility with phpunit8 Make 'headers' key optional for encoded messages [Debug][DebugClassLoader] Detect annotations before blank docblock lines on final and internal methods Fix undefined variable fromConstructor when passing context to getTypes Added translations for chineese language. Allow 3rd argument to be null Remove whitespace (tab on blank line) [Monolog] Really reset logger when calling logger::reset() [Form] Fixes debug:form appears many times as type extensions configured with new getExtendedTypes method Update src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php Update src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php ...
2 parents ce18c3b + ee2ea9d commit 580c6a7

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)