fix null value

AlexSuperStar · Aug 10, 2023 · 56a96d4 · 56a96d4
1 parent 87b396d
commit 56a96d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "alexsuperstar/jsonmaker",
   "description": "PHP JSON Maker",
   "type": "library",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "authors": [
     {
       "name": "Alexey Starikov",

diff --git a/src/alexstar/JsonMaker.php b/src/alexstar/JsonMaker.php
@@ -38,15 +38,15 @@ public function parse($data)
 		if (is_object($data) || is_array($data)) {
 			foreach ($data as $k => $v) {
 				if (is_object($data)) {
-					if (is_scalar($v)) {
+					if (is_scalar($v) || is_null($v)) {
 						$this->$k = $v;
 					}
 					else {
 						$this->$k->parse($v);
 					}
 				}
 				elseif (is_array($data)) {
-					if (is_scalar($v)) {
+					if (is_scalar($v) || is_null($v)) {
 						$this[$k] = $v;
 					}
 					else {
@@ -84,7 +84,7 @@ public function __invoke()
 					$vars[$v] = is_scalar($newVal) ? $newVal : new self($newVal);
 				}
 				else {
-					$vars = is_scalar($newVal) ? $newVal : new self($newVal);
+					$vars = is_scalar($newVal) || is_null($newVal) ? $newVal : new self($newVal);
 				}
 			}
 			return $vars;