Merge pull request #97 from taka-oyama/master

fix: negative numbers return the wrong type
salsify · Apr 14, 2023 · 6f1a5d4 · 6f1a5d4
2 parents bc0d909 + 731f5fc
commit 6f1a5d4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,8 @@
     "ext-mbstring": "*"
   },
   "require-dev": {
-    "ext-json": "*"
+    "ext-json": "*",
+    "phpunit/phpunit": "~9.6"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/ParserHelper.php b/src/ParserHelper.php
@@ -47,7 +47,7 @@ public static function convertCodepointToCharacter(int $char): string
     public static function convertToNumber(string $text)
     {
         // thanks to #andig for the fix for big integers
-        if (ctype_digit($text) && (float) $text === (float) ((int) $text)) {
+        if (filter_var($text, FILTER_VALIDATE_INT) && (float) $text === (float) ((int) $text)) {
             // natural number PHP_INT_MIN < $num < PHP_INT_MAX
             return (int) $text;
         }

diff --git a/tests/RegexListenerTest.php b/tests/RegexListenerTest.php
@@ -352,10 +352,13 @@ public function testBasicArrayReadCapture(): void
             ->getMock()
         ;
 
-        $valueCall->expects($this->exactly(2))
+        $valueCall->expects($this->exactly(3))
             ->method('__invoke')
-            ->withConsecutive(['1', '/0'],
-                ['2', '/1'])
+            ->withConsecutive(
+                ['1', '/0'],
+                ['2', '/1'],
+                ['-1', '/2']
+            )
         ;
 
         $listener = new RegexListener(["(/\d*)" => $valueCall]);

diff --git a/tests/data/simpleArray.json b/tests/data/simpleArray.json
@@ -1 +1 @@
-[1,2]
+[1,2,-1]