Added PHPDoc for generic functions

Author: JulianFun123

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

@@ -112,10 +112,13 @@ public function readString() : string {
     }
 
     private function primitiveStringToPHP($p){
+        $p = trim($p);
         if ($p == "false")
             return false;
-        if ($p == "true")
+        else if ($p == "true")
             return true;
+        else if ($p == "null")
+            return null;
         return (double) $p;
     }
 

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

@@ -10,7 +10,9 @@ public function encode($v, $tabs="") : string {
         $this->prettyPrintNewLine = $this->prettyPrint ? "\n": '';
         $identedTabs = $this->prettyPrint ? $tabs."    " : '';
 
-        if (is_bool($v)) {
+        if (!isset($v)) {
+            return "null";
+        } if (is_bool($v)) {
             return $v ? "true" : "false";
         } else if (is_int($v) || is_bool($v) || is_double($v)) {
             return strval($v);
@@ -22,10 +24,6 @@ public function encode($v, $tabs="") : string {
             return  '"'.$this->escapeString($v).'"';
         } else if (is_object($v)) {
             $v = (array) $v;
-            foreach ($v as $key=>$value) {
-                if (!isset($value))
-                    unset($v[$key]);
-            }
             if (count($v) == 0)
                 return "{}";
             return '{'.$this->prettyPrintNewLine.implode(", ".$this->prettyPrintNewLine, array_map(fn($k, $val)=>$identedTabs.$this->encode($k, $identedTabs).': '.$this->encode($val, $identedTabs), array_keys($v), array_values($v))).$this->prettyPrintNewLine.$tabs.'}';

src/test/testbootstrap.php

@@ -29,6 +29,8 @@ class Test {
     public array $aeef;
     public object $aeef2;
     public Test2 $test2;
+    public $aaaa;
+    public $aa;
     public function __construct(){
     }
 
@@ -45,11 +47,14 @@ public function setName(string $name): Test {
     "test": false,
     "feef": 21,
     "aeef": ["1","2","3"],
-    "test2": "a"
+    "test2": "a",
+    "aaaa": null,
+    "aa": false
 }';
 
 //echo Test::fromJson(JSON)->toJson();
-$json = new JSONPlus(new PHPJsonSerializationAdapter());
+$json = new JSONPlus(new JsonSerializationAdapter());
 $var = $json->fromJson(JSON, Test::class);
+
 echo $var->name."\n";
-echo $json->toJson($var);
+echo $json->toJson($var);