Skip to content

Commit de25c38

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: fix compatibility with Twig 3.10 [Strings][EnglishInflector] Fix incorrect pluralisation of 'Album' handle union and intersection types for cascaded validations move wiring of the property info extractor to the ObjectNormalizer restore deprecated properties move Process component dep to require-dev Remove calls to `onConsecutiveCalls()` fix: remove unwanted type cast accept AbstractAsset instances when filtering schemas better distinguish URL schemes and windows drive letters handle edge cases when constructing constraints with named arguments convert empty CSV header names into numeric keys
2 parents 8c35eb7 + 99a0b0f commit de25c38

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Hasher/UserPasswordHasherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function testNeedsRehash()
121121
$mockPasswordHasherFactory->expects($this->any())
122122
->method('getPasswordHasher')
123123
->with($user)
124-
->will($this->onConsecutiveCalls($hasher, $hasher, new NativePasswordHasher(5, 20000, 5), $hasher));
124+
->willReturn($hasher, $hasher, new NativePasswordHasher(5, 20000, 5), $hasher);
125125

126126
$passwordHasher = new UserPasswordHasher($mockPasswordHasherFactory);
127127

0 commit comments

Comments
 (0)