Support raw value for all integer formats

Author: Orest-Divintari

lib/PhpParser/PrettyPrinter/Standard.php

@@ -197,6 +197,10 @@ protected function pScalar_InterpolatedString(Scalar\InterpolatedString $node):
     }
 
     protected function pScalar_Int(Scalar\Int_ $node): string {
+        if ($node->getAttribute('shouldPrintRawValue') === true) {
+            return (string) $node->getAttribute('rawValue');
+        }
+
         if ($node->value === -\PHP_INT_MAX - 1) {
             // PHP_INT_MIN cannot be represented as a literal,
             // because the sign is not part of the literal
@@ -206,9 +210,7 @@ protected function pScalar_Int(Scalar\Int_ $node): string {
         $kind = $node->getAttribute('kind', Scalar\Int_::KIND_DEC);
 
         if (Scalar\Int_::KIND_DEC === $kind) {
-            return $node->getAttribute('shouldPrintRawValue')
-                ? (string) $node->getAttribute('rawValue')
-                : (string) $node->value;
+            return (string) $node->value;
         }
 
         if ($node->value < 0) {

test/PhpParser/PrettyPrinterTest.php

@@ -165,6 +165,28 @@ public static function provideTestUnnaturalLiterals() {
         ];
     }
 
+    /** @dataProvider provideTestCustomRawValue */
+    public function printCustomRawValue($node, $expected): void {
+        $prettyPrinter = new PrettyPrinter\Standard();
+        $result = $prettyPrinter->prettyPrintExpr($node);
+        $this->assertSame($expected, $result);
+    }
+
+    public static function provideTestCustomRawValue() {
+        return [
+            // Decimal with separator
+            [new Int_(1000, ['rawValue' => '10_00', 'shouldPrintRawValue' => true]), '10_00'],
+            // Hexadecimal with separator
+            [new Int_(0xDEADBEEF, ['kind' => Int_::KIND_HEX, 'rawValue' => '0xDEAD_BEEF', 'shouldPrintRawValue' => true]), '0xDEAD_BEEF'],
+            // Binary with separator
+            [new Int_(0b11110000, ['kind' => Int_::KIND_BIN, 'rawValue' => '0b1111_0000', 'shouldPrintRawValue' => true]), '0b1111_0000'],
+            // Octal with separator
+            [new Int_(0755, ['kind' => Int_::KIND_OCT, 'rawValue' => '0755_000', 'shouldPrintRawValue' => true]), '0755_000'],
+            // Without flag set, should use default formatting
+            [new Int_(1000, ['rawValue' => '10_00', 'shouldPrintRawValue' => false]), '1000'],
+        ];
+    }
+
     public function testPrettyPrintWithError(): void {
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Cannot pretty-print AST with Error nodes');