The <dateTime.iso8601> accepts zone in +HH00 format (#3)

milo · Sep 6, 2017 · ae18f8c · ae18f8c
1 parent dc4cabb
commit ae18f8c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/src/XmlRpc/xml-rpc.rng b/src/XmlRpc/xml-rpc.rng
@@ -86,7 +86,7 @@
 					<choice>
 						<data type="dateTime" />
 						<data type="string">
-							<param name="pattern">[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z?</param>
+							<param name="pattern">[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}([+-]\d\d:?\d\d|Z)?</param>
 						</data>
 					</choice>
 				</element>

diff --git a/tests/XmlRpc/Coder.dateTime.phpt b/tests/XmlRpc/Coder.dateTime.phpt
@@ -22,8 +22,15 @@ $doc->loadXML($xml);
 $var = $coder->decodeValueNode($doc->documentElement);
 Assert::equal([
 	DateTime::createFromFormat('Y-m-d H:i:s P', '2000-01-20 12:30:00 +02:30'),
+	DateTime::createFromFormat('Y-m-d H:i:s P', '2000-01-20 12:30:00 -02:30'),
 	DateTime::createFromFormat('Y-m-d H:i:s', '2000-01-20 12:30:00'),
+
 	DateTime::createFromFormat('Y-m-d H:i:s P', '2000-01-20 12:30:00 +02:30'),
+	DateTime::createFromFormat('Y-m-d H:i:s P', '2000-01-20 12:30:00 -02:30'),
 	DateTime::createFromFormat('Y-m-d H:i:s', '2000-01-20 12:30:00'),
+
 	DateTime::createFromFormat('Y-m-d H:i:s P', '2000-01-20 12:30:00 Z'),
+
+	DateTime::createFromFormat('Y-m-d H:i:s P', '2000-01-20 12:30:00+0200'),
+	DateTime::createFromFormat('Y-m-d H:i:s P', '2000-01-20 12:30:00-0200'),
 ], $var);
diff --git a/tests/XmlRpc/files/Coder.dateTime.xml b/tests/XmlRpc/files/Coder.dateTime.xml
@@ -4,18 +4,33 @@
       <value>
         <dateTime.iso8601>2000-01-20T12:30:00+02:30</dateTime.iso8601>
       </value>
+      <value>
+        <dateTime.iso8601>2000-01-20T12:30:00-02:30</dateTime.iso8601>
+      </value>
       <value>
         <dateTime.iso8601>2000-01-20T12:30:00</dateTime.iso8601>
       </value>
+
       <value>
         <dateTime.iso8601>20000120T12:30:00+02:30</dateTime.iso8601>
       </value>
       <value>
-        <dateTime.iso8601>20000120T12:30:00</dateTime.iso8601>
+        <dateTime.iso8601>20000120T12:30:00-02:30</dateTime.iso8601>
       </value>
       <value>
+        <dateTime.iso8601>20000120T12:30:00</dateTime.iso8601>
+      </value>
+
+	  <value>
         <dateTime.iso8601>20000120T12:30:00Z</dateTime.iso8601>
       </value>
+
+      <value>
+        <dateTime.iso8601>20000120T12:30:00+0200</dateTime.iso8601>
+      </value>
+      <value>
+        <dateTime.iso8601>20000120T12:30:00-0200</dateTime.iso8601>
+      </value>
     </data>
   </array>
 </value>