also allow Y-m-d\TH:i:s.v timeformat

FriendsOfCXML · Nov 13, 2024 · 91187ad · 91187ad
1 parent 865e263
commit 91187ad
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/CXml/Jms/JmsDateTimeHandler.php b/src/CXml/Jms/JmsDateTimeHandler.php
@@ -47,12 +47,18 @@ public function deserialize(XmlDeserializationVisitor $visitor, SimpleXMLElement
             return $dateTime;
         }
 
-        // else try milliseconds-format
+        // else try milliseconds-format with Timezone
         $dateTime = DateTime::createFromFormat('Y-m-d\TH:i:s.vP', $dateAsString->__toString());
         if ($dateTime instanceof DateTimeInterface) {
             return $dateTime;
         }
 
+        // else try milliseconds-format without Timezone
+        $dateTime = DateTime::createFromFormat('Y-m-d\TH:i:s.v', $dateAsString->__toString());
+        if ($dateTime instanceof DateTimeInterface) {
+            return $dateTime;
+        }
+
         // else try simple date-format
         $dateTime = Date::createFromFormat('Y-m-d', $dateAsString->__toString());
         if ($dateTime instanceof DateTimeInterface) {

diff --git a/tests/CXmlTest/Model/SerializerTest.php b/tests/CXmlTest/Model/SerializerTest.php
@@ -225,7 +225,7 @@ public function testDeserialize(): void
      * even though the cXML definition defines the timestamp value to be in ISO-8601 format there are some providers that
      * also uses the milliseconds value (i.e. JAGGAER).
      */
-    public function testDeserializeWithMilliseconds(): void
+    public function testDeserializeWithMillisecondsAndTimezone(): void
     {
         $xmlIn =
             '<?xml version="1.0" encoding="UTF-8"?>
@@ -239,7 +239,6 @@ public function testDeserializeWithMilliseconds(): void
         $cXml = $serializer->deserialize($xmlIn);
 
         $actual = $serializer->serialize($cXml);
-
         $xmlOut =
             '<?xml version="1.0" encoding="UTF-8"?>
 			<cXML timestamp="2022-06-07T10:09:56+00:00" payloadID="x.y.z">
@@ -250,6 +249,22 @@ public function testDeserializeWithMilliseconds(): void
         $this->assertXmlStringEqualsXmlString($xmlOut, $actual);
     }
 
+    public function testDeserializeWithMillisecondsNoTimezone(): void
+    {
+        $xmlIn =
+            '<?xml version="1.0" encoding="UTF-8"?>
+			<cXML timestamp="2022-06-07T10:09:56.728" payloadID="x.y.z">
+			<Response>
+			<Status code="200" text="OK">Ping Response CXml</Status>
+			</Response>
+			</cXML>';
+
+        $serializer = Serializer::create();
+        $cXml = $serializer->deserialize($xmlIn);
+
+        $this->assertSame('2022-06-07T10:09:56+00:00', $cXml->getTimestamp()->format('c'));
+    }
+
     public function testDeserializeWithDateTimeForDate(): void
     {
         $xmlIn =