Merge pull request #120 from maxmind/greg/max-int

Make integers up to PHP_INT_MAX real integers. Closes #119

Author: horgh

CHANGELOG.md

@@ -1,6 +1,15 @@
 CHANGELOG
 =========
 
+1.10.0
+------------------
+
+* When using the pure PHP reader, unsigned integers up to PHP_MAX_INT
+  will now be integers in PHP rather than strings. Previously integers
+  greater than 2^24 on 32-bit platforms and 2^56 on 64-bit platforms
+  would be strings due to the use of `gmp` or `bcmath` to decode them.
+  Reported by Alejandro Celaya. GitHub #119.
+
 1.9.0 (2021-01-07)
 ------------------
 

src/MaxMind/Db/Reader/Decoder.php

@@ -12,7 +12,7 @@
  *
  * We subtract 1 from the log to protect against precision loss.
  */
-\define(__NAMESPACE__ . '\_MM_MAX_INT_BYTES', (log(\PHP_INT_MAX, 2) - 1) / 8);
+\define(__NAMESPACE__ . '\_MM_MAX_INT_BYTES', (int) ((log(\PHP_INT_MAX, 2) - 1) / 8));
 
 class Decoder
 {
@@ -320,11 +320,17 @@ private function decodeUint(string $bytes, int $byteLength)
 
         $integer = 0;
 
+        // PHP integers are signed. _MM_MAX_INT_BYTES is the number of
+        // complete bytes that can be converted to an integer. However,
+        // we can convert another byte if the leading bit is zero.
+        $useRealInts = $byteLength <= _MM_MAX_INT_BYTES
+            || ($byteLength === _MM_MAX_INT_BYTES + 1 && (\ord($bytes[0]) & 0x80) === 0);
+
         for ($i = 0; $i < $byteLength; ++$i) {
             $part = \ord($bytes[$i]);
 
             // We only use gmp or bcmath if the final value is too big
-            if ($byteLength <= _MM_MAX_INT_BYTES) {
+            if ($useRealInts) {
                 $integer = ($integer << 8) + $part;
             } elseif (\extension_loaded('gmp')) {
                 $integer = gmp_strval(gmp_add(gmp_mul((string) $integer, '256'), $part));

tests/MaxMind/Db/Test/ReaderTest.php

@@ -64,9 +64,8 @@ public function testDecoder(): void
 
         $this->assertSame(-268435456, $record['int32']);
         $this->assertSame(100, $record['uint16']);
-        $this->assertSame(\PHP_INT_MAX < 4294967295 && !\extension_loaded('maxminddb') ? '268435456' : 268435456, $record['uint32']);
-        // @phpstan-ignore-next-line
-        $this->assertSame(\PHP_INT_MAX > 1152921504606846976 && \extension_loaded('maxminddb') ? 1152921504606846976 : '1152921504606846976', $record['uint64']);
+        $this->assertSame(268435456, $record['uint32']);
+        $this->assertSame(\PHP_INT_MAX > 1152921504606846976 ? 1152921504606846976 : '1152921504606846976', $record['uint64']);
 
         $uint128 = $record['uint128'];
 
@@ -158,9 +157,8 @@ public function testGetWithPrefixLen(): void
             ],
             'uint128' => \extension_loaded('maxminddb') ? '0x01000000000000000000000000000000' : '1329227995784915872903807060280344576',
             'uint16' => 0x64,
-            'uint32' => \PHP_INT_MAX < 4294967295 && !\extension_loaded('maxminddb') ? '268435456' : 268435456,
-            // @phpstan-ignore-next-line
-            'uint64' => \PHP_INT_MAX > 1152921504606846976 && \extension_loaded('maxminddb') ? 1152921504606846976 : '1152921504606846976',
+            'uint32' => 268435456,
+            'uint64' => \PHP_INT_MAX > 1152921504606846976 ? 1152921504606846976 : '1152921504606846976',
             'utf8_string' => 'unicode! ☯ - ♫',
         ];
         $tests = [