Added JsonSerializationAdapter.php (Custom JSON implementation) and more

JulianFun123 · JulianFun123 · commit 1fcefc4d6f78 · 2021-10-05T15:56:05.000+02:00
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 <?php
 
 use de\interaapps\jsonplus\attributes\Serialize;
-use de\interaapps\jsonplus\JSONModel;use de\interaapps\jsonplus\JSONPlus;
+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;
 
 class Test2 {
     use JSONModel;
@@ -48,6 +48,12 @@ echo $jsonPlus->fromJson($arrJson)[0];
 Test::setJsonPlusInstance($jsonPlus);
 // For all (Default instance)
 JSONPlus::$default = $jsonPlus;
+
+/// Using other JSON-Drivers
+// Uses PHPs default json_encode and json_decode methods
+$jsonPlus = new JSONPlus(new PHPJsonSerializationAdapter());
+// Uses an custom implementation of JSON. This will be automatically chosen by JSONPlus::createDefault when json_decode doesn't exist 
+$jsonPlus = new JSONPlus(new JsonSerializationAdapter());
 ```
 
 ## Installation
diff --git a/src/main/de/interaapps/jsonplus/JSONPlus.php b/src/main/de/interaapps/jsonplus/JSONPlus.php
@@ -1,10 +1,12 @@
 <?php
 namespace de\interaapps\jsonplus;
 
+use de\interaapps\jsonplus\serializationadapter\impl\JsonSerializationAdapter;
 use de\interaapps\jsonplus\serializationadapter\impl\phpjson\PHPJsonSerializationAdapter;
 use de\interaapps\jsonplus\serializationadapter\SerializationAdapter;
 use de\interaapps\jsonplus\typemapper\ObjectTypeMapper;
 use de\interaapps\jsonplus\typemapper\PassThroughTypeMapper;
+use de\interaapps\jsonplus\typemapper\StdClassObjectTypeMapper;
 use de\interaapps\jsonplus\typemapper\TypeMapper;
 use ReflectionClass;
 
@@ -29,6 +31,8 @@ public function __construct(
             "bool" => $this->passThroughTypeMapper,
             "array" => $this->passThroughTypeMapper,
             "boolean" => $this->passThroughTypeMapper,
+            "NULL" => $this->passThroughTypeMapper,
+            "stdClass" => new StdClassObjectTypeMapper($this),
         ];
     }
 
@@ -39,8 +43,9 @@ public function fromJson($json, $type=null){
     public function map($o, $type = null){
         if ($type == null) {
             $type = gettype($o);
+
             if ($type == "object")
-                $type = get_class($type);
+                $type = get_class($o);
         }
 
         foreach ($this->typeMapper as $typeName => $typeMapper) {
@@ -58,7 +63,7 @@ public function mapToJson($o, $type = null){
         if ($type == null) {
             $type = gettype($o);
             if ($type == "object")
-                $type = get_class($type);
+                $type = get_class($o);
         }
         foreach ($this->typeMapper as $typeName => $typeMapper) {
             if ($type == $typeName)
@@ -77,7 +82,7 @@ public function setPrettyPrinting(bool $prettyPrinting): JSONPlus {
     }
 
     public static function createDefault() : JSONPlus {
-        return new JSONPlus(new PHPJsonSerializationAdapter());
+        return new JSONPlus(function_exists("json_decode") ? new PHPJsonSerializationAdapter() : new JsonSerializationAdapter());
     }
 }
 JSONPlus::$default = JSONPlus::createDefault();
diff --git a/src/main/de/interaapps/jsonplus/parser/JSONDecoder.php b/src/main/de/interaapps/jsonplus/parser/JSONDecoder.php
@@ -0,0 +1,125 @@
+<?php
+namespace de\interaapps\jsonplus\parser;
+
+
+class JSONDecoder {
+    private int $i = 0;
+    public function __construct(
+        private string $json
+    ) {
+    }
+
+    public function jumpEmpties(){
+        while ((trim($this->get()) == '' || $this->get()=="\n") && $this->i < strlen($this->json))
+            $this->i++;
+    }
+
+    public function get($off = 0) : string {
+        if (strlen($this->json) > $this->i+$off && $this->i+$off >= 0)
+            return $this->json[$this->i+$off];
+        return "";
+    }
+
+    public function readNext() : mixed {
+        $this->jumpEmpties();
+
+        if ($this->get() == '{')
+            return $this->readObject();
+        if ($this->get() == '[')
+            return $this->readArray();
+        if ($this->get() == '"')
+            return $this->readString();
+
+        return $this->readPrimitive();
+    }
+    public function readObject() : object|null {
+        $o = (object)[];
+        $this->i++;
+        for (; $this->i<strlen($this->json); $this->i++) {
+            $this->jumpEmpties();
+            if ($this->get() == '}') {
+                $this->i++;
+                return $o;
+            }
+
+            $key = $this->readNext();
+            $this->jumpEmpties();
+            if ($this->get() == ":")
+                $this->i++;
+            $this->jumpEmpties();
+            $value = $this->readNext();
+
+            $o->{$key} = $value;
+
+            $this->jumpEmpties();
+            if ($this->get() == '}') {
+                $this->i++;
+                return $o;
+            }
+
+            if ($this->get(1) == ",")
+                $this->i++;
+        }
+
+        return null;
+    }
+    public function readArray() : array {
+        $this->i++;
+        $a = [];
+        for (; $this->i<strlen($this->json); $this->i++) {
+            $this->jumpEmpties();
+            if ($this->get() == ']') {
+                $this->i++;
+                return $a;
+            }
+
+            array_push($a, $this->readNext());
+
+            $this->jumpEmpties();
+            if ($this->get() == ']') {
+                $this->i++;
+                return $a;
+            }
+
+            if ($this->get(1) == ",")
+                $this->i++;
+        }
+        return [];
+    }
+
+    public function readString() : string {
+        $s = "";
+        $this->i++;
+        for (; $this->i<strlen($this->json); $this->i++) {
+            $char = $this->get();
+
+            if ($char == '"' && ($this->get(-1) != "\\" || $this->get(-2) == "\\")) {
+                if ($this->get(-1) && $this->get(-2) != "\\")
+                    $this->i++;
+                return $s;
+            }
+            $s .= $char;
+        }
+        return "";
+    }
+
+    private function primitiveStringToPHP($p){
+        if ($p == "false")
+            return false;
+        if ($p == "true")
+            return true;
+        return (double) $p;
+    }
+
+    public function readPrimitive() : mixed {
+        $p = "";
+        for (; $this->i<strlen($this->json); $this->i++) {
+            $char = $this->get();
+            if ($char == '"' || $char == ',' || $char == '}' || $char == ']')
+                return $this->primitiveStringToPHP($p);
+            $p .= $char;
+        }
+        $this->i--;
+        return $this->primitiveStringToPHP($p);
+    }
+}
diff --git a/src/main/de/interaapps/jsonplus/parser/JSONEncoder.php b/src/main/de/interaapps/jsonplus/parser/JSONEncoder.php
@@ -0,0 +1,47 @@
+<?php
+
+
+namespace de\interaapps\jsonplus\parser;
+
+
+class JSONEncoder {
+    private bool $prettyPrint = false;
+    public function encode($v, $tabs="") : string {
+        $this->prettyPrintNewLine = $this->prettyPrint ? "\n": '';
+        $identedTabs = $this->prettyPrint ? $tabs."    " : '';
+
+        if (is_bool($v)) {
+            return $v ? "true" : "false";
+        } else if (is_int($v) || is_bool($v) || is_double($v)) {
+            return strval($v);
+        } else if (is_array($v)) {
+            if (count($v) == 0)
+                return "[]";
+            return '['.$this->prettyPrintNewLine.implode(", ".$this->prettyPrintNewLine, array_map(fn($k)=>$identedTabs.$this->encode($k, $identedTabs), $v)).$this->prettyPrintNewLine.$tabs.']';
+        } else if (is_string($v)) {
+            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.'}';
+        }
+        return "";
+    }
+
+    private function escapeString($str) : string {
+        return
+            str_replace("\n", "\\n",
+                str_replace('"', '\"',
+                    str_replace("\\","\\\\", $str)));
+    }
+
+    public function setPrettyPrint(bool $prettyPrint): JSONEncoder {
+        $this->prettyPrint = $prettyPrint;
+        return $this;
+    }
+}
diff --git a/src/main/de/interaapps/jsonplus/serializationadapter/impl/JsonSerializationAdapter.php b/src/main/de/interaapps/jsonplus/serializationadapter/impl/JsonSerializationAdapter.php
@@ -0,0 +1,19 @@
+<?php
+namespace de\interaapps\jsonplus\serializationadapter\impl;
+
+use de\interaapps\jsonplus\parser\JSONDecoder;
+use de\interaapps\jsonplus\parser\JSONEncoder;
+use de\interaapps\jsonplus\serializationadapter\SerializationAdapter;
+
+
+class JsonSerializationAdapter implements SerializationAdapter {
+    public function fromJson($json){
+        return (new JSONDecoder($json))->readNext();
+    }
+
+    public function toJson($v, bool $prettyPrint) {
+        return (new JSONEncoder())
+            ->setPrettyPrint($prettyPrint)
+            ->encode($v, "");
+    }
+}
diff --git a/src/main/de/interaapps/jsonplus/typemapper/StdClassObjectTypeMapper.php b/src/main/de/interaapps/jsonplus/typemapper/StdClassObjectTypeMapper.php
@@ -0,0 +1,30 @@
+<?php
+namespace de\interaapps\jsonplus\typemapper;
+
+
+use de\interaapps\jsonplus\attributes\Serialize;
+use de\interaapps\jsonplus\JSONPlus;
+use ReflectionClass;
+
+class StdClassObjectTypeMapper implements TypeMapper {
+    public function __construct(
+        private JSONPlus $jsonPlus
+    ){
+    }
+
+    public function map(mixed $o, string $type): mixed {
+        /* Implement if CASING is implemented
+        $oo = [];
+
+        foreach ($o as $k=>$v) {
+            echo $k;
+            $oo[$k] = $v;
+        }*/
+
+        return (object) $o;
+    }
+
+    public function mapToJson(mixed $o, string $type): mixed {
+        return (object) $o;
+    }
+}
diff --git a/src/test/testbootstrap.php b/src/test/testbootstrap.php
@@ -4,6 +4,7 @@
 use de\interaapps\jsonplus\attributes\Serialize;
 use de\interaapps\jsonplus\JSONModel;
 use de\interaapps\jsonplus\JSONPlus;
+use de\interaapps\jsonplus\serializationadapter\impl\JsonSerializationAdapter;
 
 chdir(".");;
 ini_set('display_errors', 1);
@@ -37,16 +38,15 @@ public function setName(string $name): Test {
 }
 
 const JSON = '{
-    "name_": "World!",
+    "name_":"Wo\"\nrld!\\\",
+    "aeef23": {},
+    "aeef2": {"test": true},
     "test": false,
     "feef": 21,
     "aeef": [1,2,3],
-    "aeef2": {},
-    "test2": {
-        "sheesh": "yeeeeeeeee"
-    }
+    "test2": "a"
 }';
 
-Test::setJsonPlusInstance(JSONPlus::createDefault()->setPrettyPrinting(true));
-
-echo Test::fromJson(JSON)->toJson();
+//echo Test::fromJson(JSON)->toJson();
+$json = new JSONPlus(new JsonSerializationAdapter());
+var_dump($json->fromJson(JSON, Test::class));
