Support int64 in appendFieldValue

jakubkulhan · Feb 18, 2025 · 6162894 · 6162894
1 parent a168f09
commit 6162894
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/src/Protocol/ProtocolWriter.php b/src/Protocol/ProtocolWriter.php
@@ -200,8 +200,13 @@ public function appendFieldValue(mixed $value, Buffer $buffer): void
             $buffer->append($value);
 
         } elseif (is_int($value)) {
-            $buffer->appendUint8(Constants::FIELD_LONG_INT);
-            $buffer->appendInt32($value);
+           if ($value >= -2_147_483_648 && $value <= 2_147_483_647) {
+               $buffer->appendUint8(Constants::FIELD_LONG_INT);
+               $buffer->appendInt32($value);
+           } else {
+               $buffer->appendUint8(Constants::FIELD_LONG_LONG_INT);
+               $buffer->appendInt64($value);
+           }
 
         } elseif (is_bool($value)) {
             $buffer->appendUint8(Constants::FIELD_BOOLEAN);

diff --git a/test/Protocol/ProtocolWriterTest.php b/test/Protocol/ProtocolWriterTest.php
@@ -43,4 +43,38 @@ public function test_appendFieldValue_canHandleDateTimeImmutable()
 
         $protocolWriter->appendFieldValue($date, $buffer);
     }
+
+    public function test_appendFieldValue_canHandleInt32()
+    {
+        $buffer = $this->createMock(Buffer::class);
+        $protocolWriter = new ProtocolWriter();
+
+        $int = 42;
+
+        $buffer->expects($this->once())
+               ->method('appendUint8')
+               ->with(Constants::FIELD_LONG_INT);
+        $buffer->expects($this->once())
+               ->method('appendInt32')
+               ->with($int);
+
+        $protocolWriter->appendFieldValue($int, $buffer);
+    }
+
+    public function test_appendFieldValue_canHandleInt64()
+    {
+        $buffer = $this->createMock(Buffer::class);
+        $protocolWriter = new ProtocolWriter();
+
+        $int = 2_157_483_647;
+
+        $buffer->expects($this->once())
+               ->method('appendUint8')
+               ->with(Constants::FIELD_LONG_LONG_INT);
+        $buffer->expects($this->once())
+               ->method('appendInt64')
+               ->with($int);
+
+        $protocolWriter->appendFieldValue($int, $buffer);
+    }
 }