tonyair/silverstripe-restfulserver
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-restfulserver synced 2024-10-22 12:05:58 +00:00
Code Issues Projects Releases Wiki Activity

FIX Respect new typehints (#133)

Browse Source
This commit is contained in:
Guy Sartorelli 2024-08-29 15:12:39 +12:00 committed by GitHub
parent 9ee11bfaa1
commit f73c5b8592
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/DataFormatter/JSONDataFormatter.php
View File

@ -89,7 +89,12 @@ class JSONDataFormatter extends DataFormatter
continue;
}
$fieldValue = JSONDataFormatter::cast($obj->obj($fieldName));
$dbField = $obj->obj($fieldName);
if ($dbField) {
$fieldValue = JSONDataFormatter::cast($dbField);
} else {
$fieldValue = null;
}
$mappedFieldName = $this->getFieldAlias($className, $fieldName);
$serobj->$mappedFieldName = $fieldValue;
}
@ -117,10 +122,11 @@ class JSONDataFormatter extends DataFormatter
? $this->sanitiseClassName($relClass) . '/' . $obj->$fieldName
: $this->sanitiseClassName($className) . "/$id/$relName";
$href = Director::absoluteURL($rel);
$dbField = $obj->obj($fieldName);
$serobj->$relName = ArrayData::array_to_object(array(
"className" => $relClass,
"href" => "$href.json",
"id" => JSONDataFormatter::cast($obj->obj($fieldName))
"id" => $dbField ? JSONDataFormatter::cast($dbField): ''
));
}

2
src/DataFormatter/XMLDataFormatter.php
View File

@ -125,7 +125,7 @@ class XMLDataFormatter extends DataFormatter
if ($fields && !in_array($fieldName, $fields ?? [])) {
continue;
}
$fieldValue = $obj->obj($fieldName)->forTemplate();
$fieldValue = $obj->obj($fieldName)?->forTemplate();
if (!mb_check_encoding($fieldValue, 'utf-8')) {
$fieldValue = "(data is badly encoded)";
}