Skip to content

Commit 3796bd8

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: replace wurstmeister Docker images for Kafka and Zookeeper [PasswordHasher] Make bcrypt nul byte hash test tolerant to PHP related failures [HttpClient] Revert fixing curl default options [Validator] Update Dutch (nl) translation Fix exception thrown during `LDAP_MODIFY_BATCH_REMOVE_ALL` batch operations Fix various warnings across components test suite
2 parents d8c5f97 + 3c1d995 commit 3796bd8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Tests/Config/ContainerParametersResourceCheckerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function testSupports()
4040
*/
4141
public function testIsFresh(callable $mockContainer, $expected)
4242
{
43-
$mockContainer($this->container);
43+
$mockContainer($this->container, $this);
4444

4545
$this->assertSame($expected, $this->resourceChecker->isFresh($this->resource, time()));
4646
}
@@ -55,9 +55,9 @@ public static function isFreshProvider()
5555
$container->method('getParameter')->with('locales')->willReturn(['nl', 'es']);
5656
}, false];
5757

58-
yield 'fresh on every identical parameters' => [function (MockObject $container) {
59-
$container->expects(self::exactly(2))->method('hasParameter')->willReturn(true);
60-
$container->expects(self::exactly(2))->method('getParameter')
58+
yield 'fresh on every identical parameters' => [function (MockObject $container, TestCase $testCase) {
59+
$container->expects($testCase->exactly(2))->method('hasParameter')->willReturn(true);
60+
$container->expects($testCase->exactly(2))->method('getParameter')
6161
->willReturnCallback(function (...$args) {
6262
static $series = [
6363
[['locales'], ['fr', 'en']],

0 commit comments

Comments
 (0)