Nodarx/server
1
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Projects Releases Activity

fix(shared): hydrate enum members and coerce keys in collections

Browse Source 
Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
This commit is contained in:
Sebastian Krupinski
2026-07-17 15:52:07 -04:00
parent f9f824a2f0
commit eda7e0e8cc
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/lib/Json/JsonSerializableCollection.php
+22 -3
View File
@@ -34,7 +34,7 @@ abstract class JsonSerializableCollection extends CollectionAbstract implements
if (in_array($this->typeValue, $this->primitiveTypes)) {
if ($this->associative) {
foreach ($data as $key => $value) {
$this[$key] = $value;
$this[$this->normalizeKey($key)] = $value;
}
} else {
foreach ($data as $value) {
@@ -43,14 +43,24 @@ abstract class JsonSerializableCollection extends CollectionAbstract implements
}
}
if (!in_array($this->typeValue, $this->primitiveTypes) && class_exists($this->typeValue)) {
if (!in_array($this->typeValue, $this->primitiveTypes) && is_subclass_of($this->typeValue, \BackedEnum::class)) {
if ($this->associative) {
foreach ($data as $key => $value) {
$this[$this->normalizeKey($key)] = ($this->typeValue)::from($value);
}
} else {
foreach ($data as $value) {
$this[] = ($this->typeValue)::from($value);
}
}
} elseif (!in_array($this->typeValue, $this->primitiveTypes) && class_exists($this->typeValue)) {
$reflection = new \ReflectionClass($this->typeValue);
if ($reflection->implementsInterface(JsonDeserializable::class)) {
if ($this->associative) {
foreach ($data as $key => $value) {
$instance = $reflection->newInstance();
/** @var JsonDeserializable $instance */
$this[$key] = $instance->jsonDeserialize($value);
$this[$this->normalizeKey($key)] = $instance->jsonDeserialize($value);
}
} else {
foreach ($data as $value) {
@@ -65,4 +75,13 @@ abstract class JsonSerializableCollection extends CollectionAbstract implements
return $this;
}
/**
* JSON round trips turn numeric string keys into integers (and list-shaped
* payloads carry integer keys), which a string-keyed collection would
* otherwise reject on offsetSet.
*/
private function normalizeKey(int|string $key): int|string {
return $this->typeKey === self::TYPE_STRING ? (string)$key : $key;
}
}