Skip to content

Commit 79b073c

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: fix compatibility with Redis Relay 0.8.1 use more entropy with uniqid() [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 3bfc744 + 430a73d commit 79b073c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Debug/TraceableSerializer.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(
3737

3838
public function serialize(mixed $data, string $format, array $context = []): string
3939
{
40-
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid();
40+
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid('', true);
4141

4242
$startTime = microtime(true);
4343
$result = $this->serializer->serialize($data, $format, $context);
@@ -52,7 +52,7 @@ public function serialize(mixed $data, string $format, array $context = []): str
5252

5353
public function deserialize(mixed $data, string $type, string $format, array $context = []): mixed
5454
{
55-
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid();
55+
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid('', true);
5656

5757
$startTime = microtime(true);
5858
$result = $this->serializer->deserialize($data, $type, $format, $context);
@@ -67,7 +67,7 @@ public function deserialize(mixed $data, string $type, string $format, array $co
6767

6868
public function normalize(mixed $object, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
6969
{
70-
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid();
70+
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid('', true);
7171

7272
$startTime = microtime(true);
7373
$result = $this->serializer->normalize($object, $format, $context);
@@ -82,7 +82,7 @@ public function normalize(mixed $object, ?string $format = null, array $context
8282

8383
public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
8484
{
85-
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid();
85+
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid('', true);
8686

8787
$startTime = microtime(true);
8888
$result = $this->serializer->denormalize($data, $type, $format, $context);
@@ -97,7 +97,7 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
9797

9898
public function encode(mixed $data, string $format, array $context = []): string
9999
{
100-
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid();
100+
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid('', true);
101101

102102
$startTime = microtime(true);
103103
$result = $this->serializer->encode($data, $format, $context);
@@ -112,7 +112,7 @@ public function encode(mixed $data, string $format, array $context = []): string
112112

113113
public function decode(string $data, string $format, array $context = []): mixed
114114
{
115-
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid();
115+
$context[self::DEBUG_TRACE_ID] = $traceId = uniqid('', true);
116116

117117
$startTime = microtime(true);
118118
$result = $this->serializer->decode($data, $format, $context);

Tests/Mapping/Factory/ClassMetadataFactoryCompilerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ final class ClassMetadataFactoryCompilerTest extends TestCase
2727

2828
protected function setUp(): void
2929
{
30-
$this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_serializer_metadata.'.uniqid('CompiledClassMetadataFactory').'.php';
30+
$this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_serializer_metadata.'.uniqid('CompiledClassMetadataFactory', true).'.php';
3131
}
3232

3333
protected function tearDown(): void

0 commit comments

Comments
 (0)