Issue-414: Allow The Option of T or space for Date time. (jsonrainbow…

…#415)
erayd · Apr 12, 2017 · 992e1c3 · 992e1c3
1 parent 7ec8f1b
commit 992e1c3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/JsonSchema/Rfc3339.php b/src/JsonSchema/Rfc3339.php
@@ -4,7 +4,7 @@
 
 class Rfc3339
 {
-    const REGEX = '/^(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2})(\.\d+)?(Z|([+-]\d{2}):?(\d{2}))$/';
+    const REGEX = '/^(\d{4}-\d{2}-\d{2}[T ]{1}\d{2}:\d{2}:\d{2})(\.\d+)?(Z|([+-]\d{2}):?(\d{2}))$/';
 
     /**
      * Try creating a DateTime instance
@@ -22,8 +22,8 @@ public static function createFromString($string)
         $dateAndTime = $matches[1];
         $microseconds = $matches[2] ?: '.000000';
         $timeZone = 'Z' !== $matches[3] ? $matches[4] . ':' . $matches[5] : '+00:00';
-
-        $dateTime = \DateTime::createFromFormat('Y-m-d\TH:i:s.uP', $dateAndTime . $microseconds . $timeZone, new \DateTimeZone('UTC'));
+        $dateFormat = strpos($dateAndTime, 'T') === false ? 'Y-m-d H:i:s.uP' : 'Y-m-d\TH:i:s.uP';
+        $dateTime = \DateTime::createFromFormat($dateFormat, $dateAndTime . $microseconds . $timeZone, new \DateTimeZone('UTC'));
 
         return $dateTime ?: null;
     }

diff --git a/tests/Rfc3339Test.php b/tests/Rfc3339Test.php
@@ -35,8 +35,14 @@ public function provideValidFormats()
                 '2000-05-01T12:12:12Z',
                 \DateTime::createFromFormat('Y-m-d\TH:i:s', '2000-05-01T12:12:12', new \DateTimeZone('UTC'))
             ),
-            array('2000-05-01T12:12:12+0100', \DateTime::createFromFormat('Y-m-d\TH:i:sP', '2000-05-01T12:12:12+01:00')),
-            array('2000-05-01T12:12:12+01:00', \DateTime::createFromFormat('Y-m-d\TH:i:sP', '2000-05-01T12:12:12+01:00')),
+            array(
+                '2000-05-01T12:12:12+0100',
+                \DateTime::createFromFormat('Y-m-d\TH:i:sP', '2000-05-01T12:12:12+01:00')
+            ),
+            array(
+                '2000-05-01T12:12:12+01:00',
+                \DateTime::createFromFormat('Y-m-d\TH:i:sP', '2000-05-01T12:12:12+01:00')
+            ),
             array(
                 '2000-05-01T12:12:12.123456Z',
                 \DateTime::createFromFormat('Y-m-d\TH:i:s.u', '2000-05-01T12:12:12.123456', new \DateTimeZone('UTC'))
@@ -45,6 +51,14 @@ public function provideValidFormats()
                 '2000-05-01T12:12:12.123Z',
                 \DateTime::createFromFormat('Y-m-d\TH:i:s.u', '2000-05-01T12:12:12.123000', new \DateTimeZone('UTC'))
             ),
+            array(
+                '2000-05-01 12:12:12.123Z',
+                \DateTime::createFromFormat('Y-m-d H:i:s.u', '2000-05-01 12:12:12.123000', new \DateTimeZone('UTC'))
+            ),
+            array(
+                '2000-05-01 12:12:12.123456Z',
+                \DateTime::createFromFormat('Y-m-d H:i:s.u', '2000-05-01 12:12:12.123456', new \DateTimeZone('UTC'))
+            )
         );
     }
 
@@ -54,6 +68,8 @@ public function provideInvalidFormats()
             array('1999-1-11T00:00:00Z'),
             array('1999-01-11T00:00:00+100'),
             array('1999-01-11T00:00:00+1:00'),
+            array('1999-01-01  00:00:00Z'),
+            array('1999-1-11 00:00:00Z')
         );
     }
 }