upstream/icingadb-web
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb-web.git synced 2026-06-09 08:42:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix key-value formatting for json and csv result set

Browse source 
Remove parameter type for second argument (`$value`) in `CsvResultSet::formatValue` and `JsonResultSet::formatValue`.
Also add date time formatting for `$value` parameter in case it is an instance of `DateTime` object.
This commit is contained in:
raviks789 2023-06-20 15:42:55 +02:00 committed by Johannes Meyer
parent 1756065b2a
commit 3628e97fde
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/Icingadb/Data/CsvResultSet.php
View file

@ -4,6 +4,8 @@
namespace Icinga\Module\Icingadb\Data;
use DateTime;
use DateTimeZone;
use ipl\Orm\Model;
use ipl\Orm\Query;
use ipl\Orm\ResultSet;
@ -17,7 +19,7 @@ class CsvResultSet extends ResultSet
return $this->extractKeysAndValues(parent::current());
}
protected function formatValue(string $key, ?string $value): ?string
protected function formatValue(string $key, $value): ?string
{
if (
$value
@ -38,6 +40,9 @@ class CsvResultSet extends ResultSet
return '"' . str_replace('"', '""', $value) . '"';
} elseif (is_array($value)) {
return '"' . implode(',', $value) . '"';
} elseif ($value instanceof DateTime) {
return $value->setTimezone(new DateTimeZone('UTC'))
->format('Y-m-d\TH:i:s.vP');
} else {
return $value;
}

9
library/Icingadb/Data/JsonResultSet.php
View file

@ -4,6 +4,8 @@
namespace Icinga\Module\Icingadb\Data;
use DateTime;
use DateTimeZone;
use Icinga\Util\Json;
use ipl\Orm\Model;
use ipl\Orm\Query;
@ -18,7 +20,7 @@ class JsonResultSet extends ResultSet
return $this->createObject(parent::current());
}
protected function formatValue(string $key, ?string $value): ?string
protected function formatValue(string $key, $value): ?string
{
if (
$value
@ -33,6 +35,11 @@ class JsonResultSet extends ResultSet
$value = bin2hex($value);
}
if ($value instanceof DateTime) {
return $value->setTimezone(new DateTimeZone('UTC'))
->format('Y-m-d\TH:i:s.vP');
}
return $value;
}