fixup! feat(database): introduce Snowflake IDs generator

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>

Author: Altahrim

lib/private/SnowflakeId.php

@@ -29,9 +29,9 @@ final class SnowflakeId implements ISnowflakeId {
 	private int $sequenceId = 0;
 
 	public function __construct(
-		private readonly int|string $id,
+		private readonly string $id,
 	) {
-		if (is_string($id) && !ctype_digit($id)) {
+		if (!ctype_digit($id)) {
 			throw new \Exception('Invalid Snowflake ID: ' . $id);
 		}
 	}
@@ -62,8 +62,7 @@ private function decode64bits(): void {
 	}
 
 	private function decode32bits(): void {
-		$id = is_int($this->id) ? number_format($this->id, 0, '', '') : $this->id;
-		$id = $this->convertBase16($id);
+		$id = $this->convertBase16($this->id);
 
 		$firstQuarter = (int)hexdec(substr($id, 0, 4));
 		$secondQuarter = (int)hexdec(substr($id, 4, 4));

lib/private/SnowflakeIdGenerator.php

@@ -26,7 +26,7 @@ public function __construct(
 	) {
 	}
 
-	public function __invoke(): int|string {
+	public function __invoke(): string {
 		// Time related
 		[$seconds, $milliseconds] = $this->getCurrentTime();
 
@@ -42,7 +42,7 @@ public function __invoke(): int|string {
 		if (PHP_INT_SIZE === 8) {
 			$firstHalf = $seconds & 0x7FFFFFFF;
 			$secondHalf = (($milliseconds & 0x3FF) << 22) | ($serverId << 13) | ($isCli << 12) | $sequenceId;
-			return $firstHalf << 32 | $secondHalf;
+			return (string)($firstHalf << 32 | $secondHalf);
 		}
 
 		// Fallback for 32 bits systems

tests/lib/SnowflakeIdGeneratorTest.php

@@ -29,11 +29,7 @@ public function testGenerator(): void {
 		$generator = new SnowflakeIdGenerator(new TimeFactory(), $this->cacheFactory);
 		$snowflakeId = ($generator)();
 		$this->assertGreaterThan(0x100000000, $snowflakeId);
-		if (PHP_INT_SIZE === 8) {
-			$this->assertIsInt($snowflakeId);
-		} else {
-			$this->assertIsString($snowflakeId);
-		}
+		$this->assertIsString($snowflakeId);
 	}
 
 	#[DataProvider('provideSnowflakeData')]

tests/lib/SnowflakeIdTest.php

@@ -32,52 +32,26 @@ public function testDecode(
 	}
 
 	public static function provideSnowflakeIds(): array {
-		return PHP_INT_SIZE === 8
-			?  [
-				[4688076898113587, 1760368327.984, 392, 2099, true],
-				// Max all (can't happen ms are up to 999)
-				[0x7fffffffffffffff, 3906760448.023, 511, 4095, true],
-				// Max all (real)
-				[0x7ffffffff9ffffff, 3906760447.999, 511, 4095, true],
-				// Max seconds
-				[0x7fffffff00000000, 3906760447, 0, 0, false],
-				// Max milliseconds
-				[4190109696, 1759276800.999, 0, 0, false],
-				// Max serverId
-				[4186112, 1759276800.0, 511, 0, false],
-				// Max sequenceId
-				[4095, 1759276800.0, 0, 4095, false],
-				// Max isCli
-				[4096, 1759276800.0, 0, 0, true],
-				// Min
-				[0, 1759276800, 0, 0, false],
-				// Other
-				[250159983611680096, 1817521710, 392, 1376, true],
-			]
-			:  [
-				['4688076898113587', 1760368327.984, 392, 2099, true],
-				// Max all (can't this-appen ms are up to 999)
-				['9223372036854775807', 3906760448.023, 511, 4095, true],
-				// Max all (real)
-				['9223372036754112511', 3906760447.999, 511, 4095, true],
-				// Max seconds
-				['9223372032559808512', 3906760447, 0, 0, false],
-				// Max milliseconds
-				['4190109696', 1759276800.999, 0, 0, false],
-				// Max serverId
-				['4186112', 1759276800.0, 511, 0, false],
-				[4186112, 1759276800.0, 511, 0, false],
-				// Max secondsuenceId
-				['4095', 1759276800.0, 0, 4095, false],
-				[4095, 1759276800.0, 0, 4095, false],
-				// Max isCli
-				['4096', 1759276800.0, 0, 0, true],
-				[4096, 1759276800.0, 0, 0, true],
-				// Min
-				['0', 1759276800, 0, 0, false],
-				[0, 1759276800, 0, 0, false],
-				// Other
-				['250159983611680096', 1817521710, 392, 1376, true],
-			];
+		[
+			['4688076898113587', 1760368327.984, 392, 2099, true],
+			// Max all (can't this-appen ms are up to 999)
+			['9223372036854775807', 3906760448.023, 511, 4095, true],
+			// Max all (real)
+			['9223372036754112511', 3906760447.999, 511, 4095, true],
+			// Max seconds
+			['9223372032559808512', 3906760447, 0, 0, false],
+			// Max milliseconds
+			['4190109696', 1759276800.999, 0, 0, false],
+			// Max serverId
+			['4186112', 1759276800.0, 511, 0, false],
+			// Max secondsuenceId
+			['4095', 1759276800.0, 0, 4095, false],
+			// Max isCli
+			['4096', 1759276800.0, 0, 0, true],
+			// Min
+			['0', 1759276800, 0, 0, false],
+			// Other
+			['250159983611680096', 1817521710, 392, 1376, true],
+		];
 	}
 }