print raw value using shouldPrintRawValue

Author: Orest-Divintari

lib/PhpParser/Node/Scalar/Int_.php

@@ -12,8 +12,6 @@ class Int_ extends Scalar {
     public const KIND_DEC = 10;
     public const KIND_HEX = 16;
 
-    public const KIND_RAW_VALUE = 22;
-
     /** @var int Number value */
     public int $value;
 
@@ -42,10 +40,6 @@ public function getSubNodeNames(): array {
      * @return Int_ The constructed LNumber, including kind attribute
      */
     public static function fromString(string $str, array $attributes = [], bool $allowInvalidOctal = false): Int_ {
-        if(isset($attributes['kind']) && $attributes['kind'] === self::KIND_RAW_VALUE){
-            return new Int_((int) $str, $attributes);
-        }
-
         $attributes['rawValue'] = $str;
 
         $str = str_replace('_', '', $str);

lib/PhpParser/PrettyPrinter/Standard.php

@@ -206,7 +206,9 @@ protected function pScalar_Int(Scalar\Int_ $node): string {
         $kind = $node->getAttribute('kind', Scalar\Int_::KIND_DEC);
 
         if (Scalar\Int_::KIND_DEC === $kind) {
-            return (string) $node->value;
+            return $node->getAttribute('shouldPrintRawValue')
+                ? (string) $node->getAttribute('rawValue')
+                : (string) $node->value;
         }
 
         if ($node->value < 0) {
@@ -224,11 +226,6 @@ protected function pScalar_Int(Scalar\Int_ $node): string {
             case Scalar\Int_::KIND_HEX:
                 return $sign . '0x' . base_convert($str, 10, 16);
         }
-
-        if (Scalar\Int_::KIND_RAW_VALUE === $kind) {
-            return (string) $node->getAttribute('rawValue');
-        }
-        
         throw new \Exception('Invalid number kind');
     }
 

test/PhpParser/PrettyPrinterTest.php

@@ -308,10 +308,8 @@ public function testInvalidIndent(): void {
 
     public function testPrintCustomRawValue(): void {
         $prettyPrinter = new PrettyPrinter\Standard();
-        $rawValue = '10_00';
-        $attributes = ['rawValue' => $rawValue, 'kind' => Int_::KIND_RAW_VALUE];
+        $node = new Int_(1000, ['rawValue' => '10_00', 'shouldPrintRawValue' => true]);
 
-        $this->assertSame($rawValue, $prettyPrinter->prettyPrintExpr(new Int_(1000, $attributes)));
-        $this->assertSame($rawValue, $prettyPrinter->prettyPrintExpr(Int_::fromString('1000', $attributes)));
+        $this->assertSame('10_00', $prettyPrinter->prettyPrintExpr($node));
     }
 }