Merge branch '4.x' into 5.x

This commit is contained in:
Ben Ramsey
2023-04-15 18:38:51 -05:00
10 changed files with 61 additions and 41 deletions
+15 -15
View File
@@ -48,11 +48,11 @@ class ExpectedBehaviorTest extends TestCase
$this->assertSame(
(string) $uuid->getHex(),
$uuid->getFields()->getTimeLow()->toString()
. $uuid->getFields()->getTimeMid()->toString()
. $uuid->getFields()->getTimeHiAndVersion()->toString()
. $uuid->getFields()->getClockSeqHiAndReserved()->toString()
. $uuid->getFields()->getClockSeqLow()->toString()
. $uuid->getFields()->getNode()->toString()
. $uuid->getFields()->getTimeMid()->toString()
. $uuid->getFields()->getTimeHiAndVersion()->toString()
. $uuid->getFields()->getClockSeqHiAndReserved()->toString()
. $uuid->getFields()->getClockSeqLow()->toString()
. $uuid->getFields()->getNode()->toString()
);
$this->assertStringStartsWith('urn:uuid:', $uuid->getUrn());
@@ -63,21 +63,21 @@ class ExpectedBehaviorTest extends TestCase
$this->assertSame(
$uuid->toString(),
$uuid->getFields()->getTimeLow()->toString() . '-'
. $uuid->getFields()->getTimeMid()->toString() . '-'
. $uuid->getFields()->getTimeHiAndVersion()->toString() . '-'
. $uuid->getFields()->getClockSeqHiAndReserved()->toString()
. $uuid->getFields()->getClockSeqLow()->toString() . '-'
. $uuid->getFields()->getNode()->toString()
. $uuid->getFields()->getTimeMid()->toString() . '-'
. $uuid->getFields()->getTimeHiAndVersion()->toString() . '-'
. $uuid->getFields()->getClockSeqHiAndReserved()->toString()
. $uuid->getFields()->getClockSeqLow()->toString() . '-'
. $uuid->getFields()->getNode()->toString()
);
$this->assertSame(
(string) $uuid,
$uuid->getFields()->getTimeLow()->toString() . '-'
. $uuid->getFields()->getTimeMid()->toString() . '-'
. $uuid->getFields()->getTimeHiAndVersion()->toString() . '-'
. $uuid->getFields()->getClockSeqHiAndReserved()->toString()
. $uuid->getFields()->getClockSeqLow()->toString() . '-'
. $uuid->getFields()->getNode()->toString()
. $uuid->getFields()->getTimeMid()->toString() . '-'
. $uuid->getFields()->getTimeHiAndVersion()->toString() . '-'
. $uuid->getFields()->getClockSeqHiAndReserved()->toString()
. $uuid->getFields()->getClockSeqLow()->toString() . '-'
. $uuid->getFields()->getNode()->toString()
);
$this->assertSame(Variant::Rfc4122, $uuid->getFields()->getVariant());