[LNumber] Add rawValue attribute to LNumber to allow numeric separato…

…r etc. (nikic#832)
esa-kian · May 15, 2022 · d3eb10a · d3eb10a
1 parent a6e3466
commit d3eb10a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/lib/PhpParser/Node/Scalar/LNumber.php b/lib/PhpParser/Node/Scalar/LNumber.php
@@ -41,6 +41,8 @@ public function getSubNodeNames() : array {
      * @return LNumber The constructed LNumber, including kind attribute
      */
     public static function fromString(string $str, array $attributes = [], bool $allowInvalidOctal = false) : LNumber {
+        $attributes['rawValue'] = $str;
+
         $str = str_replace('_', '', $str);
 
         if ('0' !== $str[0] || '0' === $str) {
@@ -71,7 +73,7 @@ public static function fromString(string $str, array $attributes = [], bool $all
         $attributes['kind'] = LNumber::KIND_OCT;
         return new LNumber(intval($str, 8), $attributes);
     }
-    
+
     public function getType() : string {
         return 'Scalar_LNumber';
     }

diff --git a/test/PhpParser/Node/Scalar/NumberTest.php b/test/PhpParser/Node/Scalar/NumberTest.php
@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Scalar;
+
+use PhpParser\Node\Stmt\Echo_;
+use PhpParser\ParserFactory;
+
+class NumberTest extends \PHPUnit\Framework\TestCase
+{
+    public function testRawValue()
+    {
+        $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        $nodes = $parser->parse('<?php echo 1_234;');
+
+        $echo = $nodes[0];
+        $this->assertInstanceOf(Echo_::class, $echo);
+
+        /** @var Echo_ $echo */
+        $lLumber = $echo->exprs[0];
+        $this->assertInstanceOf(LNumber::class, $lLumber);
+
+        /** @var LNumber $lnumber */
+        $this->assertSame(1234, $lLumber->value);
+        $this->assertSame('1_234', $lLumber->getAttribute('rawValue'));
+    }
+}
diff --git a/test/PhpParser/NodeAbstractTest.php b/test/PhpParser/NodeAbstractTest.php
@@ -245,6 +245,7 @@ function functionName(&$a = 0, $b = 1.0) {
                     "attributes": {
                         "startLine": 4,
                         "endLine": 4,
+                        "rawValue": "0",
                         "kind": 10
                     }
                 },
@@ -398,6 +399,7 @@ function functionName(&$a = 0, $b = 1.0) {
                     "attributes": {
                         "startLine": 4,
                         "endLine": 4,
+                        "rawValue": "0",
                         "kind": 10
                     },
                     "value": 0