Skip to content

Commit c878a1b

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: [Cache] Improve `dbindex` DSN parameter parsing Support for PHP-CS-Fixer's parallel runner use more entropy with uniqid() [Contracts][HttpClient] Skip tests when zlib's `ob_gzhandler()` doesn't exist
2 parents 25cb13e + 0a9f66c commit c878a1b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/CacheWarmer/AnnotationsCacheWarmerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class AnnotationsCacheWarmerTest extends TestCase
3434

3535
protected function setUp(): void
3636
{
37-
$this->cacheDir = sys_get_temp_dir().'/'.uniqid();
37+
$this->cacheDir = sys_get_temp_dir().'/'.uniqid('', true);
3838
$fs = new Filesystem();
3939
$fs->mkdir($this->cacheDir);
4040
parent::setUp();

Tests/CacheWarmer/ConfigBuilderCacheWarmerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class ConfigBuilderCacheWarmerTest extends TestCase
3737

3838
protected function setUp(): void
3939
{
40-
$this->varDir = sys_get_temp_dir().'/'.uniqid();
40+
$this->varDir = sys_get_temp_dir().'/'.uniqid('', true);
4141
$fs = new Filesystem();
4242
$fs->mkdir($this->varDir);
4343
}

0 commit comments

Comments
 (0)