Skip to content

[PHP] Include microseconds in serialized date-time #4542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Nov 21, 2019
Merged

[PHP] Include microseconds in serialized date-time #4542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5029c15
[PHP] Include milliseconds in serialized date-time
hinrik Nov 19, 2019
64570d2
Add setDateTimeFormat()
hinrik Nov 20, 2019
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
17 changes: 15 additions & 2 deletions modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@ use {{modelPackage}}\ModelInterface;
*/
class ObjectSerializer
{
/** @var string */
private static $dateTimeFormat = \DateTime::ATOM;

/**
* Change the date format
*
* @param string $format the new date format to use
*/
public static function setDateTimeFormat($format)
{
self::$dateTimeFormat = $format;
}

/**
* Serialize data
*
Expand All @@ -45,7 +58,7 @@ class ObjectSerializer
if (is_scalar($data) || null === $data) {
return $data;
} elseif ($data instanceof \DateTime) {
return ($format === 'date') ? $data->format('Y-m-d') : $data->format(\DateTime::ATOM);
return ($format === 'date') ? $data->format('Y-m-d') : $data->format(self::$dateTimeFormat);
} elseif (is_array($data)) {
foreach ($data as $property => $value) {
$data[$property] = self::sanitizeForSerialization($value);
Expand Down Expand Up @@ -178,7 +191,7 @@ class ObjectSerializer
public static function toString($value)
{
if ($value instanceof \DateTime) { // datetime in ISO8601 format
return $value->format(\DateTime::ATOM);
return $value->format(self::$dateTimeFormat);
} else if (is_bool($value)) {
return $value ? 'true' : 'false';
} else {
Expand Down
17 changes: 15 additions & 2 deletions samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,19 @@
*/
class ObjectSerializer
{
/** @var string */
private static $dateTimeFormat = \DateTime::ATOM;

/**
* Change the date format
*
* @param string $format the new date format to use
*/
public static function setDateTimeFormat($format)
{
self::$dateTimeFormat = $format;
}

/**
* Serialize data
*
Expand All @@ -55,7 +68,7 @@ public static function sanitizeForSerialization($data, $type = null, $format = n
if (is_scalar($data) || null === $data) {
return $data;
} elseif ($data instanceof \DateTime) {
return ($format === 'date') ? $data->format('Y-m-d') : $data->format(\DateTime::ATOM);
return ($format === 'date') ? $data->format('Y-m-d') : $data->format(self::$dateTimeFormat);
} elseif (is_array($data)) {
foreach ($data as $property => $value) {
$data[$property] = self::sanitizeForSerialization($value);
Expand Down Expand Up @@ -188,7 +201,7 @@ public static function toFormValue($value)
public static function toString($value)
{
if ($value instanceof \DateTime) { // datetime in ISO8601 format
return $value->format(\DateTime::ATOM);
return $value->format(self::$dateTimeFormat);
} else if (is_bool($value)) {
return $value ? 'true' : 'false';
} else {
Expand Down
5 changes: 5 additions & 0 deletions samples/client/petstore/php/OpenAPIClient-php/tests/DateTimeSerializerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ public function testDateTimeSanitazion()
$data = ObjectSerializer::sanitizeForSerialization($input);

$this->assertEquals($data->dateTime, '1973-04-30T17:05:00+02:00');

ObjectSerializer::setDateTimeFormat(\DateTime::RFC3339_EXTENDED);
$dataFraction = ObjectSerializer::sanitizeForSerialization($input);
$this->assertEquals($dataFraction->dateTime, '1973-04-30T17:05:00.000+02:00');
ObjectSerializer::setDateTimeFormat(\DateTime::ATOM);
}

public function testDateSanitazion()
Expand Down
17 changes: 15 additions & 2 deletions samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,19 @@
*/
class ObjectSerializer
{
/** @var string */
private static $dateTimeFormat = \DateTime::ATOM;

/**
* Change the date format
*
* @param string $format the new date format to use
*/
public static function setDateTimeFormat($format)
{
self::$dateTimeFormat = $format;
}

/**
* Serialize data
*
Expand All @@ -55,7 +68,7 @@ public static function sanitizeForSerialization($data, $type = null, $format = n
if (is_scalar($data) || null === $data) {
return $data;
} elseif ($data instanceof \DateTime) {
return ($format === 'date') ? $data->format('Y-m-d') : $data->format(\DateTime::ATOM);
return ($format === 'date') ? $data->format('Y-m-d') : $data->format(self::$dateTimeFormat);
} elseif (is_array($data)) {
foreach ($data as $property => $value) {
$data[$property] = self::sanitizeForSerialization($value);
Expand Down Expand Up @@ -188,7 +201,7 @@ public static function toFormValue($value)
public static function toString($value)
{
if ($value instanceof \DateTime) { // datetime in ISO8601 format
return $value->format(\DateTime::ATOM);
return $value->format(self::$dateTimeFormat);
} else if (is_bool($value)) {
return $value ? 'true' : 'false';
} else {
Expand Down
5 changes: 5 additions & 0 deletions samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/DateTimeSerializerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ public function testDateTimeSanitazion()
$data = ObjectSerializer::sanitizeForSerialization($input);

$this->assertEquals($data->dateTime, '1973-04-30T17:05:00+02:00');

ObjectSerializer::setDateTimeFormat(\DateTime::RFC3339_EXTENDED);
$dataFraction = ObjectSerializer::sanitizeForSerialization($input);
$this->assertEquals($dataFraction->dateTime, '1973-04-30T17:05:00.000+02:00');
ObjectSerializer::setDateTimeFormat(\DateTime::ATOM);
}

public function testDateSanitazion()
Expand Down