Remove "allow leading zeros" code

doctrine · Jun 17, 2024 · 2cc0fae · 2cc0fae
1 parent fc86908
commit 2cc0fae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 29 deletions.
diff --git a/src/Types/BigIntType.php b/src/Types/BigIntType.php
@@ -8,7 +8,6 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 
 use function assert;
-use function ctype_digit;
 use function is_int;
 use function is_string;
 use function rtrim;
@@ -54,24 +53,13 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): int
             'DBAL assumes values outside of the integer range to be returned as string by the database driver.',
         );
 
-        if (str_starts_with($value, '-') || str_starts_with($value, '+')) {
-            $hasNegativeSign = str_starts_with($value, '-');
-            $value           = substr($value, 1);
-        } else {
-            $hasNegativeSign = false;
-        }
-
-        while (substr($value, 0, 1) === '0' && ctype_digit(substr($value, 1, 1))) {
-            $value = substr($value, 1);
-        }
-
         $dotPos = strpos($value, '.');
         if ($dotPos !== false && rtrim(substr($value, $dotPos + 1), '0') === '') {
             $value = substr($value, 0, $dotPos);
         }
 
-        if ($hasNegativeSign && $value !== '0') {
-            $value = '-' . $value;
+        if (str_starts_with($value, '+') || $value === '-0') {
+            $value = substr($value, 1);
         }
 
         if ($value === (string) (int) $value) {

diff --git a/tests/Functional/Types/BigIntTypeTest.php b/tests/Functional/Types/BigIntTypeTest.php
@@ -11,9 +11,6 @@
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
 
-use function str_starts_with;
-use function substr;
-
 use const PHP_INT_MAX;
 use const PHP_INT_MIN;
 use const PHP_INT_SIZE;
@@ -53,18 +50,6 @@ public function testSelectBigInt(string $sqlLiteral, int|string|null $expectedVa
                 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}> */