Merge pull request #15 from b-nobis/main

Fix string including comma

Author: adhocore

src/PadsJson.php

@@ -71,7 +71,7 @@ protected function padObject($tmpJson)
         }
 
         $part = \substr($tmpJson, $this->objectPos + 1);
-        if (\preg_match('/(\s*\"[^"]+\"\s*:\s*[^,]+,?)+$/', $part, $matches)) {
+        if (\preg_match('/(\s*\"[^"]+\"\s*:\s*([^,]+|\"(?:.(?!(?<![\\\\])"))*.?"?),?)+$/', $part, $matches)) {
             return $tmpJson;
         }
 

tests/FixerTest.php

@@ -160,6 +160,9 @@ public function theTests()
         ], [
             'json'   => '[ {"id":1, "data": []}, {"id":2, "data": [',
             'expect' => '[ {"id":1, "data": []}, {"id":2, "data": []}]',
+        ], [
+            'json'   => '[ {"id":1, "data": []}, {"id":2, "data": "bla,',
+            'expect' => '[ {"id":1, "data": []}, {"id":2, "data": "bla,"}]',
         ],
         ];
     }