Finish negative-map

et-nik · Nov 15, 2018 · f6ac9bd · f6ac9bd
2 parents 38e4913 + c17ceff
commit f6ac9bd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/BinnMap.php b/src/BinnMap.php
@@ -99,7 +99,7 @@ private function _binnLoad($binnString)
         // Data
         $stopWhile = false;
         while ($pos < $this->size && !$stopWhile) {
-            $varKey = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
+            $varKey = $this->unpack(self::BINN_INT32, substr($binnString, $pos, 4));
             $pos += 4;
 
             $varType = $this->unpack(self::BINN_UINT8, $binnString[$pos]);
@@ -184,7 +184,7 @@ public function getBinnVal()
             $type = $arr[self::KEY_TYPE];
             $storageType = $this->storageType($type);
 
-            $this->binnString .= $this->pack(self::BINN_UINT32, $key);
+            $this->binnString .= $this->pack(self::BINN_INT32, $key);
 
             if ($type === self::BINN_BOOL) {
                 $this->binnString .= $arr[self::KEY_VAL]

diff --git a/tests/BinnMapTest.php b/tests/BinnMapTest.php
@@ -52,4 +52,12 @@ public function testValidArray()
         $this->assertTrue(BinnMap::validArray([1 => 0, 2 => 2]));
         $this->assertFalse(BinnMap::validArray(['key' => 'val']));
     }
+
+    public function testNegativeKey()
+    {
+        $binn = new BinnMap();
+        $array = [-2 => 543, -8 => 'test'];
+        $binnString = $binn->serialize($array);
+        $this->assertEquals($array, $binn->unserialize($binnString));
+    }
 }