Added enum support

Author: JulianFun123

README.md

@@ -37,22 +37,29 @@ class Organisation {
     public string $name;
 }
 
+enum UserType {
+    case ADMIN;
+    case MEMBER;
+}
+
 class User {
     use JSONModel;
 
-    public int id;
+    public int $id;
 
     #[Serialize("first_name")]
-    public string firstName;
+    public string $firstName;
 
     #[Serialize(hidden: true)]
-    public string password;
+    public string $password;
 
     public ?Organisation $organisation;
 
     // Set Type for array:
     #[ArrayType(User::class)]
     public array $friends;
+    
+    public UserType $type = UserType::MEMBER;
 }
 
 $json = '{
@@ -67,7 +74,8 @@ $json = '{
             "first_name": "John",
             "friends": []
         }
-    ]
+    ],
+    "type": "USER"
 }';
 
 // Decoding the JSON
@@ -95,6 +103,7 @@ For Typed Arrays:
 /** 
 * @var array<User> 
 */
+private array $myArray;
 ```
 
 ## Installation

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "interaapps/jsonplus",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "type": "library",
     "authors": [
         {
@@ -9,7 +9,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0"
+        "php": ">=8.1"
     },
     "autoload": {
         "psr-4": {

src/main/de/interaapps/jsonplus/JSONPlus.php

@@ -5,6 +5,7 @@
 use de\interaapps\jsonplus\serializationadapter\impl\phpjson\PHPJsonSerializationAdapter;
 use de\interaapps\jsonplus\serializationadapter\SerializationAdapter;
 use de\interaapps\jsonplus\typemapper\ArrayTypeMapper;
+use de\interaapps\jsonplus\typemapper\EnumTypeMapper;
 use de\interaapps\jsonplus\typemapper\ObjectTypeMapper;
 use de\interaapps\jsonplus\typemapper\PassThroughTypeMapper;
 use de\interaapps\jsonplus\typemapper\StdClassObjectTypeMapper;
@@ -21,7 +22,7 @@ class JSONPlus {
     public function __construct(
         private SerializationAdapter $serializationAdapter
     ){
-        $this->defaultTypeMapper = new ObjectTypeMapper($this);
+        $this->defaultTypeMapper = new ObjectTypeMapper($this, new EnumTypeMapper());
         $this->passThroughTypeMapper = new PassThroughTypeMapper();
         $this->typeMapper = [
             "object" => $this->passThroughTypeMapper,

src/main/de/interaapps/jsonplus/typemapper/EnumTypeMapper.php

@@ -2,13 +2,18 @@
 
 namespace de\interaapps\jsonplus\typemapper;
 
-class EnumTypeMapper implements TypeMapper {
+class EnumTypeMapper {
 
-    public function map(mixed $o, string $type): mixed {
-        return $type::{$o}->value;
+    public function map(\ReflectionClass $enum, string $name): mixed {
+        foreach ($enum->getMethod("cases")->invoke(null) as $entry) {
+            if ($entry->name == $name)
+                return $entry;
+        }
+
+        return null;
     }
 
-    public function mapToJson(mixed $o, string $type): mixed {
-        return $o->name;
+    public function mapToJson(\ReflectionClass $enum, mixed $type): mixed {
+        return $type->name;
     }
 }

src/main/de/interaapps/jsonplus/typemapper/ObjectTypeMapper.php

@@ -9,7 +9,8 @@
 
 class ObjectTypeMapper implements TypeMapper {
     public function __construct(
-        private JSONPlus $jsonPlus
+        private JSONPlus $jsonPlus,
+        private EnumTypeMapper $enumTypeMapper
     ){
     }
 
@@ -18,6 +19,10 @@ public function map(mixed $o, string $type): mixed {
             return null;
 
         $class = new ReflectionClass(str_replace("?", "", $type));
+        if ($class->isEnum()) {
+            return $this->enumTypeMapper->map($class, $o);
+        }
+
         $oo = $class->newInstance();
 
         foreach ($class->getProperties() as $property) {
@@ -53,13 +58,19 @@ public function mapToJson(mixed $o, string $type): mixed {
         if ($o === null)
             return null;
         $class = new ReflectionClass(str_replace("?", "", $type));
+
+        if ($class->isEnum()) {
+            return $this->enumTypeMapper->mapToJson($class, $o);
+        }
+
         $oo = [];
         foreach ($class->getProperties() as $property) {
             if (!$property->isStatic()) {
                 $name = $property?->getName();
 
                 $overrideName = $property?->getName();
                 $serializeAttribs = $property->getAttributes(Serialize::class);
+
                 foreach ($serializeAttribs as $attrib) {
                     $attrib = $attrib->newInstance();
                     $overrideName = $attrib->value;

src/test/testbootstrap.php

@@ -22,6 +22,13 @@ class Test2 {
     public string $sheesh;
 }
 
+
+
+enum MyEnum {
+    case HEY;
+    case WORLD;
+}
+
 class Test {
     use JSONModel;
     #[Serialize("name_")]
@@ -33,6 +40,9 @@ class Test {
     public Test2 $test2;
     public $aaaa;
     public $aa;
+
+    public ?MyEnum $myEnum = null;
+
     public function __construct(){
     }
 
@@ -57,7 +67,7 @@ public function setName(string $name): Test {
 echo Test::fromJson(JSON)->toJson();
 $json = new JSONPlus(new JsonSerializationAdapter());
 $var = $json->fromJson(JSON, Test::class);
-
+echo $var->myEnum;
 echo $var->name."\n";
 echo $json->toJson($var);
 
@@ -80,6 +90,8 @@ class Test3 {
     }
 ]', Test2::class);
 
+
+
 foreach ($arr as $val) {
     echo $val->sheesh;
 }

uppm.json

@@ -1,7 +1,7 @@
 {
     "name": "interaapps/jsonplus",
-    "version": "1.0.4",
-    "phpVersion": ">8.0",
+    "version": "1.0.5",
+    "phpVersion": ">8.1",
     "repositories": [],
     "run": {
         "test": "src\/test\/testbootstrap.php"