bug #40003 [Uid] Fix time to float conversion (fancyweb)

nicolas-grekas · nicolas-grekas · commit 6a935bb9777a · 2021-01-27T19:10:53.000+01:00
This PR was merged into the 5.2 branch. Discussion ---------- [Uid] Fix time to float conversion | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - On 32b systems, when the timestamp is before the UNIX epoch, the result is currently shifted by 1. Inverting all the bits is not enough, we need to add 1. I guess https://en.wikipedia.org/wiki/Two%27s_complement is relevant here? Alternative: ```php $time = -1 * self::toBase(self::add($time ^ "\xff\xff\xff\xff\xff\xff\xff\xff", "\x00\x00\x00\x00\x00\x00\x00\x01"), self::BASE10); ``` Commits ------- 9680a27 [Uid] Fix time to float conversion
diff --git a/src/Symfony/Component/Uid/BinaryUtil.php b/src/Symfony/Component/Uid/BinaryUtil.php
@@ -124,7 +124,7 @@ public static function timeToFloat(string $time): float
         $time = self::add($time, self::TIME_OFFSET_COM2);
 
         if ($time >= self::TIME_OFFSET_COM2) {
-            $time = -1 * self::toBase($time ^ "\xff\xff\xff\xff\xff\xff\xff\xff", self::BASE10);
+            $time = -1 * (self::toBase($time ^ "\xff\xff\xff\xff\xff\xff\xff\xff", self::BASE10) + 1);
         } else {
             $time[0] = $time[0] & "\x7F";
             $time = self::toBase($time, self::BASE10);
diff --git a/src/Symfony/Component/Uid/Tests/UuidTest.php b/src/Symfony/Component/Uid/Tests/UuidTest.php
@@ -199,4 +199,13 @@ public function testFromStringOnExtendedClassReturnsStatic()
     {
         $this->assertInstanceOf(CustomUuid::class, CustomUuid::fromString(self::A_UUID_V4));
     }
+
+    public function testGetTime()
+    {
+        $this->assertSame(103072857660.6847, ((new UuidV1('ffffffff-ffff-1fff-a456-426655440000'))->getTime()));
+        $this->assertSame(0.0000001, ((new UuidV1('13814001-1dd2-11b2-a456-426655440000'))->getTime()));
+        $this->assertSame(0.0, (new UuidV1('13814000-1dd2-11b2-a456-426655440000'))->getTime());
+        $this->assertSame(-0.0000001, (new UuidV1('13813fff-1dd2-11b2-a456-426655440000'))->getTime());
+        $this->assertSame(-12219292800.0, ((new UuidV1('00000000-0000-1000-a456-426655440000'))->getTime()));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -199,4 +199,13 @@ public function testFromStringOnExtendedClassReturnsStatic()`
`199`	`199`	`{`
`200`	`200`	`$this->assertInstanceOf(CustomUuid::class, CustomUuid::fromString(self::A_UUID_V4));`
`201`	`201`	`}`
	`202`	`+`
	`203`	`+ public function testGetTime()`
	`204`	`+ {`
	`205`	`+ $this->assertSame(103072857660.6847, ((new UuidV1('ffffffff-ffff-1fff-a456-426655440000'))->getTime()));`
	`206`	`+ $this->assertSame(0.0000001, ((new UuidV1('13814001-1dd2-11b2-a456-426655440000'))->getTime()));`
	`207`	`+ $this->assertSame(0.0, (new UuidV1('13814000-1dd2-11b2-a456-426655440000'))->getTime());`
	`208`	`+ $this->assertSame(-0.0000001, (new UuidV1('13813fff-1dd2-11b2-a456-426655440000'))->getTime());`
	`209`	`+ $this->assertSame(-12219292800.0, ((new UuidV1('00000000-0000-1000-a456-426655440000'))->getTime()));`
	`210`	`+ }`
`202`	`211`	`}`