Skip to content

Commit 64f7f24

Browse files
Merge branch '2.7' into 2.8
* 2.7: Various fixes esp. on Windows Fix the validation of form resources to register the default theme Fix the retrieval of the value with property path when using a loader [appveyor] minor enhancements [Process] Disable failing tests on Windows [Translation] Fix the string casting in the XliffFileLoader Windows and Intl fixes Add appveyor.yml for C.I. on Windows [VarDumper] fixed HtmlDumper to target specific the head tag [travis] merge php: nightly and deps=high test-matrix lines consistently use str_replace to unify directory separators Support omitting the <target> node in an .xlf file. Fix the handling of values for multiple choice types moved PHP nightly to PHP 7.0 [Security] Add missing docblock in PreAuthenticatedToken Conflicts: .travis.yml
2 parents 1132917 + 20f111d commit 64f7f24

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/Functional/UserPasswordEncoderCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public function testEncodePasswordEmptySalt()
3333
'password' => 'password',
3434
'user-class' => 'Symfony\Component\Security\Core\User\User',
3535
'--empty-salt' => true,
36-
));
37-
$expected = file_get_contents(__DIR__.'/app/PasswordEncode/emptysalt.txt');
36+
), array('decorated' => false));
37+
$expected = str_replace("\n", PHP_EOL, file_get_contents(__DIR__.'/app/PasswordEncode/emptysalt.txt'));
3838

3939
$this->assertEquals($expected, $this->passwordEncoderCommandTester->getDisplay());
4040
}

0 commit comments

Comments
 (0)