Skip to content

Commit cf9b564

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: 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 [VarExporter] fix proxy helper when a method returns null [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 dc8a8c2 + 734ba81 commit cf9b564

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Config/ContainerParametersResourceCheckerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function testSupports()
3939
*/
4040
public function testIsFresh(callable $mockContainer, $expected)
4141
{
42-
$mockContainer($this->container);
42+
$mockContainer($this->container, $this);
4343

4444
$this->assertSame($expected, $this->resourceChecker->isFresh($this->resource, time()));
4545
}

0 commit comments

Comments
 (0)