Skip to content

Commit 1a744dc

Browse files
Merge branch '5.4' into 6.0
* 5.4: [5.4] cs fixes [5.3] cs fixes [Cache] Fix saving items with no expiration through ProxyAdapter CS fixes [HttpClient] Fix tracing requests made after calling withOptions() [Cache] disable lock on CLI Revert "feature #41989 [Cache] make `LockRegistry` use semaphores when possible (nicolas-grekas)" [HttpKernel] fix how configuring log-level and status-code by exception works [VarDumper] add more "transient-on-macos" groups
2 parents 9ca4948 + 1710596 commit 1a744dc

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Tests/Dumper/ServerDumperTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public function testDumpForwardsToWrappedDumperWhenServerIsUnavailable()
3737
$dumper->dump($data);
3838
}
3939

40+
/**
41+
* @group transient-on-macos
42+
*/
4043
public function testDump()
4144
{
4245
$wrappedDumper = $this->createMock(DataDumperInterface::class);

Tests/Server/ConnectionTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ class ConnectionTest extends TestCase
2222
{
2323
private const VAR_DUMPER_SERVER = 'tcp://127.0.0.1:9913';
2424

25+
/**
26+
* @group transient-on-macos
27+
*/
2528
public function testDump()
2629
{
2730
$cloner = new VarCloner();

0 commit comments

Comments
 (0)