Fix ini_parse_quantity()

Author: nicolas-grekas

src/Php82/Php82.php

@@ -174,6 +174,42 @@ public static function ini_parse_quantity(string $value): int
 
                 return 0;
             }
+
+            $digits_consumed = $digits;
+            /* Ignore leading whitespace. */
+            while ($digits_consumed < $str_end && false !== strpos($ctype_space, $value[$digits_consumed])) {
+                ++$digits_consumed;
+            }
+            if ($digits_consumed !== $str_end && ($value[$digits_consumed] === '+' || $value[$digits_consumed] === '-')) {
+                ++$digits_consumed;
+            }
+
+            if ($value[$digits_consumed] === '0') {
+                /* Value is just 0 */
+                if ($digits_consumed + 1 === $str_end) {
+                    goto evaluation;
+                }
+                switch ($value[$digits_consumed + 1]) {
+                    case 'x':
+                    case 'X':
+                    case 'o':
+                    case 'O':
+                    case 'b':
+                    case 'B':
+                        $digits_consumed += 2;
+                    break;
+                }
+            }
+
+            if ($digits !== $digits_consumed) {
+                $message = sprintf(
+                    'Invalid quantity "%s": no digits after base prefix, interpreting as "0" for backwards compatibility',
+                    self::escapeString($value)
+                );
+                trigger_error($message, \E_USER_WARNING);
+
+                return 0;
+            }
         }
 
         evaluation:
@@ -197,16 +233,6 @@ public static function ini_parse_quantity(string $value): int
 
         $digits_end = $digits;
 
-        // The native function treats 0x0x123 the same as 0x123.  This is a bug which we must replicate.
-        if (
-            16 === $base
-            && $digits_end + 2 < $str_end
-            && '0x' === substr($value, $digits_end, 2)
-            && false !== strpos($allowed_digits, $value[$digits_end + 2])
-        ) {
-            $digits_end += 2;
-        }
-
         while ($digits_end < $str_end && false !== strpos($allowed_digits, $value[$digits_end])) {
             ++$digits_end;
         }

tests/Php82/Php82Test.php

@@ -240,19 +240,6 @@ public function testIniParseQuantity()
         $this->assertSame(-17179869184, ini_parse_quantity('-0X10G'));
     }
 
-    public function testIniParseQuantityUndocumentedFeatures()
-    {
-        $this->assertSame(18, ini_parse_quantity('0x0x12'));
-
-        $this->assertSame(2, ini_parse_quantity('0b+10'));
-        $this->assertSame(8, ini_parse_quantity('0o+10'));
-        $this->assertSame(16, ini_parse_quantity('0x+10'));
-
-        $this->assertSame(2, ini_parse_quantity('0b 10'));
-        $this->assertSame(8, ini_parse_quantity('0o 10'));
-        $this->assertSame(16, ini_parse_quantity('0x 10'));
-    }
-
     public function testIniParseQuantityZeroWithMultiplier()
     {
         // Note that "1 K" is valid
@@ -314,8 +301,8 @@ public function testIniParseQuantityNoLeadingDigits()
     public function testIniParseQuantityOutOfRange()
     {
         error_clear_last();
-        $this->assertSame(-4096, @ini_parse_quantity(' 0x-4K '));
-        $this->assertSame('Invalid quantity " 0x-4K ": value is out of range, using overflow result for backwards compatibility', error_get_last()['message']);
+        $this->assertSame(0, @ini_parse_quantity(' 0x-4K '));
+        $this->assertSame('Invalid quantity " 0x-4K ": no digits after base prefix, interpreting as "0" for backwards compatibility', error_get_last()['message']);
         $this->assertContains(error_get_last()['type'], [\E_WARNING, \E_USER_WARNING]);
     }
 
@@ -339,7 +326,7 @@ public function testIniParseQuantitySignAfterPrefixButNoDigits()
     {
         error_clear_last();
         $this->assertSame(0, @ini_parse_quantity(' 0b- '));
-        $this->assertSame('Invalid quantity " 0b- ": no valid leading digits, interpreting as "0" for backwards compatibility', error_get_last()['message']);
+        $this->assertSame('Invalid quantity " 0b- ": no digits after base prefix, interpreting as "0" for backwards compatibility', error_get_last()['message']);
         $this->assertContains(error_get_last()['type'], [\E_WARNING, \E_USER_WARNING]);
     }