Merge pull request #17 from andreamk/20220803_AL_add_skip_magic_methods-to-unserialize

now JSON_SKIP_MAGIC_METHODS work on unserialize

Author: andreamk

src/AbstractJsonSerializeObjData.php

@@ -124,11 +124,12 @@ final protected static function valueToJsonData($value, $flags = 0, $objParents
      * Return value from json decoded data
      *
      * @param mixed               $value json decoded data
+     * @param int                 $flags flags bitmask
      * @param ?JsonUnserializeMap $map   unserialize map
      *
      * @return mixed
      */
-    final protected static function jsonDataToValue($value, $map = null)
+    final protected static function jsonDataToValue($value, $flags = 0, $map = null)
     {
         if ($map !== null) {
             $current = $map->getCurrent();
@@ -144,15 +145,15 @@ final protected static function jsonDataToValue($value, $map = null)
                         $result = [];
                         foreach ($mappedVal as $key => $arrayVal) {
                             $map->setCurrent($key, $current);
-                            $result[$key] = self::jsonDataToValue($arrayVal, $map);
+                            $result[$key] = self::jsonDataToValue($arrayVal, $flags, $map);
                         };
                         return $result;
                     case 'object':
                         /** @var object $mappedVal */
                         if (!is_array($value)) {
                             $value = [];
                         }
-                        return self::fillObjFromValue($value, $mappedVal, $map);
+                        return self::fillObjFromValue($value, $mappedVal, $flags, $map);
                     default:
                         return $mappedVal;
                 }
@@ -168,10 +169,10 @@ final protected static function jsonDataToValue($value, $map = null)
                         if ($map !== null) {
                             $map->setCurrent($key, $current);
                         }
-                        $result[$key] = self::jsonDataToValue($arrayVal, $map);
+                        $result[$key] = self::jsonDataToValue($arrayVal, $flags, $map);
                     }
                 } else {
-                    $result = self::fillObjFromValue($value, self::getObjFromClass($newClassName), $map);
+                    $result = self::fillObjFromValue($value, self::getObjFromClass($newClassName), $flags, $map);
                 }
                 return $result;
             case 'boolean':
@@ -208,11 +209,12 @@ final public static function getObjFromClass($class)
      *
      * @param mixed[]             $value value from json data
      * @param object              $obj   object to fill with json data
+     * @param int                 $flags flags bitmask
      * @param ?JsonUnserializeMap $map   unserialize map
      *
      * @return object
      */
-    final protected static function fillObjFromValue($value, $obj, $map = null)
+    final protected static function fillObjFromValue($value, $obj, $flags = 0, $map = null)
     {
         if ($map !== null) {
             $current = $map->getCurrent();
@@ -227,10 +229,11 @@ final protected static function fillObjFromValue($value, $obj, $map = null)
                 if ($map !== null) {
                     $map->setCurrent($arrayProp, $current);
                 }
-                $obj->{$arrayProp} = self::jsonDataToValue($arrayValue, $map);
+                $obj->{$arrayProp} = self::jsonDataToValue($arrayValue, $flags, $map);
             }
         } else {
-            if (method_exists($obj, '__unserialize')) {
+            $skipMagicMethods = ($flags & self::JSON_SKIP_MAGIC_METHODS);
+            if (!$skipMagicMethods && method_exists($obj, '__unserialize')) {
                 $obj->__unserialize($value);
             } else {
                 $reflect = new ReflectionObject($obj);
@@ -246,10 +249,10 @@ final protected static function fillObjFromValue($value, $obj, $map = null)
                     if (!array_key_exists($propName, $value) || $prop->isStatic()) {
                         continue;
                     }
-                    $prop->setValue($obj, self::jsonDataToValue($value[$propName], $map));
+                    $prop->setValue($obj, self::jsonDataToValue($value[$propName], $flags, $map));
                 }
 
-                if (method_exists($obj, '__wakeup')) {
+                if (!$skipMagicMethods && method_exists($obj, '__wakeup')) {
                     $obj->__wakeup();
                 }
             }

src/JsonSerialize.php

@@ -77,7 +77,7 @@ public static function serializeToData($value, $flags = 0)
     public static function unserialize($json, $depth = 512, $flags = 0)
     {
         $publicArray = json_decode($json, true, $depth, $flags);
-        return self::jsonDataToValue($publicArray);
+        return self::jsonDataToValue($publicArray, $flags);
     }
 
     /**
@@ -96,7 +96,7 @@ public static function unserializeWithMap($json, JsonUnserializeMap $map, $depth
     {
         $publicArray = json_decode($json, true, $depth, $flags);
         $map->setCurrent('');
-        return self::jsonDataToValue($publicArray, $map);
+        return self::jsonDataToValue($publicArray, $flags, $map);
     }
 
     /**
@@ -123,7 +123,7 @@ public static function unserializeToObj($json, $obj, $depth = 512, $flags = 0)
         if (!is_array($value)) {
             throw new Exception('json value isn\'t an array');
         }
-        return self::fillObjFromValue($value, $obj);
+        return self::fillObjFromValue($value, $obj, $flags);
     }
 
     /**