Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions system/DataConverter/DataConverter.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
*/
private DataCaster $dataCaster;

/**
* List of field names defined in $types.
*
* @var list<string>
*/
private array $typeFields;

/**
* @param array<string, class-string> $castHandlers Custom convert handlers
*
Expand Down Expand Up @@ -62,6 +69,7 @@ public function __construct(
private Closure|string|null $extractor = null,
) {
$this->dataCaster = new DataCaster($castHandlers, $types, $this->helper);
$this->typeFields = array_keys($types);
}

/**
Expand All @@ -75,7 +83,7 @@ public function __construct(
*/
public function fromDataSource(array $data): array
{
foreach (array_keys($this->types) as $field) {
foreach ($this->typeFields as $field) {
if (array_key_exists($field, $data)) {
$data[$field] = $this->dataCaster->castAs($data[$field], $field, 'get');
}
Expand All @@ -95,7 +103,7 @@ public function fromDataSource(array $data): array
*/
public function toDataSource(array $phpData): array
{
foreach (array_keys($this->types) as $field) {
foreach ($this->typeFields as $field) {
if (array_key_exists($field, $phpData)) {
$phpData[$field] = $this->dataCaster->castAs($phpData[$field], $field, 'set');
}
Expand Down
Loading