Skip to content

Commit

Permalink
Merge branch '5.4' into 6.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
xabbuh committed May 13, 2024
2 parents d8c5f97 + 3c1d995 commit 3796bd8
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Tests/Config/ContainerParametersResourceCheckerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function testSupports()
*/
public function testIsFresh(callable $mockContainer, $expected)
{
$mockContainer($this->container);
$mockContainer($this->container, $this);

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

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

0 comments on commit 3796bd8

Please sign in to comment.