Improved handling of serialized falsy values (like empty arrays)

vecodenet · May 23, 2024 · d66f11e · d66f11e
1 parent 1263107
commit d66f11e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "vecode/caldera-orm",
   "description": "Query builder and ORM layer, part of Vecode Caldera",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "type": "library",
   "license": "MIT",
   "authors": [

diff --git a/src/Database/Model/AbstractMetaModel.php b/src/Database/Model/AbstractMetaModel.php
@@ -52,7 +52,8 @@ function getMetadata(string $name = '', $default = '') {
 				->where('name', $name)
 				->first();
 			if ($row) {
-				$ret = @unserialize($row->value) ?: $row->value;
+				$unserialized = @unserialize($row->value);
+				$ret = $unserialized !== false ? $unserialized : $row->value;
 			}
 		} else {
 			$rows = QueryFactory::build(static::$meta_table)
@@ -64,7 +65,8 @@ function getMetadata(string $name = '', $default = '') {
 			if ($rows) {
 				$this->metadata = [];
 				foreach ($rows as $row) {
-					$this->metadata[$row->name] = @unserialize($row->value) ?: $row->value;
+					$unserialized = @unserialize($row->value);
+					$this->metadata[$row->name] = $unserialized !== false ? $unserialized : $row->value;
 				}
 			}
 		}
@@ -100,4 +102,4 @@ function setMetadata($name = null, $value = ''): void {
 			}
 		}
 	}
-}
+}