Skip to content

Commit 46d0829

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: fix code style [Uid] Hardcode UuidV3 & UuidV5 TYPE conditional constants [Uid] Use the Uuid constructor when reconstructing an Ulid from its RFC-4122 version stop using void in test files parse cookie values containing the equal sign make some time dependent tests more resilient fix code style Remove full head content in HTML to text converter do not break when loading schemas from network paths on Windows apply the sort callback on the whole search result
2 parents 85aedf1 + ad8baff commit 46d0829

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Store/PostgreSqlDbalStoreTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
*/
2525
class PostgreSqlDbalStoreTest extends AbstractStoreTest
2626
{
27-
use SharedLockStoreTestTrait;
2827
use BlockingStoreTestTrait;
28+
use SharedLockStoreTestTrait;
2929

3030
/**
3131
* {@inheritdoc}

Tests/Store/PostgreSqlStoreTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
*/
2525
class PostgreSqlStoreTest extends AbstractStoreTest
2626
{
27-
use SharedLockStoreTestTrait;
2827
use BlockingStoreTestTrait;
28+
use SharedLockStoreTestTrait;
2929

3030
/**
3131
* {@inheritdoc}

0 commit comments

Comments
 (0)