Added PHPDoc for generic functions

Author: JulianFun123

src/main/de/interaapps/jsonplus/parser/JSONDecoder.php

@@ -93,6 +93,14 @@ public function readString() : string {
         for (; $this->i<strlen($this->json); $this->i++) {
             $char = $this->get();
 
+            foreach (['"'=>'"', "\\"=>"\\", "n"=>"\n", "r"=>"\r", "f"=>"\f", "t"=>"\t", "v"=>"\v", "/"=>"/"] as $k=>$v) {
+                if ($char == "\\" && $this->get(1) == $k) {
+                    $char = $v;
+                    $this->i++;
+                    break;
+                }
+            }
+
             if ($char == '"' && ($this->get(-1) != "\\" || $this->get(-2) == "\\")) {
                 if ($this->get(-1) && $this->get(-2) != "\\")
                     $this->i++;

src/main/de/interaapps/jsonplus/parser/JSONEncoder.php

@@ -36,8 +36,13 @@ public function encode($v, $tabs="") : string {
     private function escapeString($str) : string {
         return
             str_replace("\n", "\\n",
+            str_replace("\r", "\\r",
+            str_replace("\t", "\\t",
+            str_replace("/", "\\/",
+            str_replace("\f", "\\f",
+            str_replace("\v", "\\v",
                 str_replace('"', '\"',
-                    str_replace("\\","\\\\", $str)));
+                    str_replace("\\","\\\\", $str))))))));
     }
 
     public function setPrettyPrint(bool $prettyPrint): JSONEncoder {

src/test/testbootstrap.php

@@ -5,6 +5,7 @@
 use de\interaapps\jsonplus\JSONModel;
 use de\interaapps\jsonplus\JSONPlus;
 use de\interaapps\jsonplus\serializationadapter\impl\JsonSerializationAdapter;
+use de\interaapps\jsonplus\serializationadapter\impl\phpjson\PHPJsonSerializationAdapter;
 
 chdir(".");;
 ini_set('display_errors', 1);
@@ -38,7 +39,7 @@ public function setName(string $name): Test {
 }
 
 const JSON = '{
-    "name_":"Wo\"\nrld!\\\",
+    "name_":"Wo\"\nrld!\\\ /",
     "aeef23": {},
     "aeef2": {"test": true},
     "test": false,
@@ -48,7 +49,7 @@ public function setName(string $name): Test {
 }';
 
 //echo Test::fromJson(JSON)->toJson();
-$json = new JSONPlus(new JsonSerializationAdapter());
+$json = new JSONPlus(new PHPJsonSerializationAdapter());
 $var = $json->fromJson(JSON, Test::class);
-echo $var->test."\n";
+echo $var->name."\n";
 echo $json->toJson($var);