Skip to content

Commit 91187ad

Browse files
committed
also allow Y-m-d\TH:i:s.v timeformat
1 parent 865e263 commit 91187ad

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

src/CXml/Jms/JmsDateTimeHandler.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,18 @@ public function deserialize(XmlDeserializationVisitor $visitor, SimpleXMLElement
4747
return $dateTime;
4848
}
4949

50-
// else try milliseconds-format
50+
// else try milliseconds-format with Timezone
5151
$dateTime = DateTime::createFromFormat('Y-m-d\TH:i:s.vP', $dateAsString->__toString());
5252
if ($dateTime instanceof DateTimeInterface) {
5353
return $dateTime;
5454
}
5555

56+
// else try milliseconds-format without Timezone
57+
$dateTime = DateTime::createFromFormat('Y-m-d\TH:i:s.v', $dateAsString->__toString());
58+
if ($dateTime instanceof DateTimeInterface) {
59+
return $dateTime;
60+
}
61+
5662
// else try simple date-format
5763
$dateTime = Date::createFromFormat('Y-m-d', $dateAsString->__toString());
5864
if ($dateTime instanceof DateTimeInterface) {

tests/CXmlTest/Model/SerializerTest.php

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public function testDeserialize(): void
225225
* even though the cXML definition defines the timestamp value to be in ISO-8601 format there are some providers that
226226
* also uses the milliseconds value (i.e. JAGGAER).
227227
*/
228-
public function testDeserializeWithMilliseconds(): void
228+
public function testDeserializeWithMillisecondsAndTimezone(): void
229229
{
230230
$xmlIn =
231231
'<?xml version="1.0" encoding="UTF-8"?>
@@ -239,7 +239,6 @@ public function testDeserializeWithMilliseconds(): void
239239
$cXml = $serializer->deserialize($xmlIn);
240240

241241
$actual = $serializer->serialize($cXml);
242-
243242
$xmlOut =
244243
'<?xml version="1.0" encoding="UTF-8"?>
245244
<cXML timestamp="2022-06-07T10:09:56+00:00" payloadID="x.y.z">
@@ -250,6 +249,22 @@ public function testDeserializeWithMilliseconds(): void
250249
$this->assertXmlStringEqualsXmlString($xmlOut, $actual);
251250
}
252251

252+
public function testDeserializeWithMillisecondsNoTimezone(): void
253+
{
254+
$xmlIn =
255+
'<?xml version="1.0" encoding="UTF-8"?>
256+
<cXML timestamp="2022-06-07T10:09:56.728" payloadID="x.y.z">
257+
<Response>
258+
<Status code="200" text="OK">Ping Response CXml</Status>
259+
</Response>
260+
</cXML>';
261+
262+
$serializer = Serializer::create();
263+
$cXml = $serializer->deserialize($xmlIn);
264+
265+
$this->assertSame('2022-06-07T10:09:56+00:00', $cXml->getTimestamp()->format('c'));
266+
}
267+
253268
public function testDeserializeWithDateTimeForDate(): void
254269
{
255270
$xmlIn =

0 commit comments

Comments
 (0)