Unify impl. for whole int range

doctrine · May 28, 2024 · dc5cd73 · dc5cd73
1 parent dcbddf3
commit dc5cd73
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 10 deletions.
diff --git a/src/Types/BigIntType.php b/src/Types/BigIntType.php
@@ -10,9 +10,7 @@
 use function assert;
 use function is_int;
 use function is_string;
-
-use const PHP_INT_MAX;
-use const PHP_INT_MIN;
+use function preg_replace;
 
 /**
  * Type that attempts to map a database BIGINT to a PHP int.
@@ -47,18 +45,15 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): int
             return $value;
         }
 
-        if (
-            ($value > PHP_INT_MIN && $value < PHP_INT_MAX)
-            || $value === (string) (int) $value
-        ) {
-            return (int) $value;
-        }
-
         assert(
             is_string($value),
             'DBAL assumes values outside of the integer range to be returned as string by the database driver.',
         );
 
+        if (preg_replace('~^(\+|-(?=0+($|\.)))|(?<=^|^[+\-])0+(?=\d)|\.0+$~', '', $value) === (string) (int) $value) {
+            return (int) $value;
+        }
+
         return $value;
     }
 }
diff --git a/tests/Functional/Types/BigIntTypeTest.php b/tests/Functional/Types/BigIntTypeTest.php
@@ -15,6 +15,9 @@
 use const PHP_INT_MIN;
 use const PHP_INT_SIZE;
 
+use function str_starts_with;
+use function substr;
+
 class BigIntTypeTest extends FunctionalTestCase
 {
     #[DataProvider('provideBigIntLiterals')]
@@ -38,6 +41,26 @@ public function testSelectBigInt(string $sqlLiteral, int|string|null $expectedVa
                 Types::BIGINT,
             ),
         );
+
+        self::assertSame(
+            $expectedValue,
+            $this->connection->convertToPHPValue(
+                $sqlLiteral . '.00',
+                Types::BIGINT,
+            ),
+        );
+
+        $startsWithSign = str_starts_with($sqlLiteral, '-') || str_starts_with($sqlLiteral, '+');
+
+        self::assertSame(
+            $expectedValue,
+            $this->connection->convertToPHPValue(
+            ($startsWithSign ? substr($sqlLiteral, 0, 1) : '')
+                . '00'
+                ($startsWithSign ? substr($sqlLiteral, 1) : $sqlLiteral),
+                Types::BIGINT,
+            ),
+        );
     }
 
     /** @return Generator<string, array{string, int|string|null}> */
@@ -53,6 +76,11 @@ public static function provideBigIntLiterals(): Generator
         yield 'large negative number' => [PHP_INT_SIZE === 4 ? '-2147483647' : '-9223372036854775807', PHP_INT_MIN + 1];
         yield 'largest positive number' => [PHP_INT_SIZE === 4 ? '2147483647' : '9223372036854775807', PHP_INT_MAX];
         yield 'largest negative number' => [PHP_INT_SIZE === 4 ? '-2147483648' : '-9223372036854775808', PHP_INT_MIN];
+
+        yield 'plus largest positive number' => [
+            PHP_INT_SIZE === 4 ? '+2147483647' : '+9223372036854775807',
+            PHP_INT_MAX,
+        ];
     }
 
     public function testUnsignedBigIntOnMySQL(): void