Merge pull request #23 from paranoiq/master

Support for ISO date-time with timezone offset
jsonrainbow · Jan 31, 2013 · e260665 · e260665
2 parents 78151a5 + 86631ea
commit e260665
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/JsonSchema/Constraints/Format.php b/src/JsonSchema/Constraints/Format.php
@@ -40,8 +40,10 @@ public function check($element, $schema = null, $path = null, $i = null)
                 break;
 
             case 'date-time':
-                if (!$this->validateDateTime($element, 'Y-m-d\TH:i:s\Z')) {
-                    $this->addError($path, sprintf('Invalid date time %s, expected format YYYY-MM-DDTHH:MM:SSZ', json_encode($element)));
+                if (!$this->validateDateTime($element, 'Y-m-d\TH:i:s\Z') &&
+                    !$this->validateDateTime($element, 'Y-m-d\TH:i:sP')
+                ) {
+                    $this->addError($path, sprintf('Invalid date time %s, expected format YYYY-MM-DDTHH:MM:SSZ or YYYY-MM-DDTHH:MM:SS+HH:MM', json_encode($element)));
                 }
                 break;
 
@@ -155,4 +157,4 @@ protected function validateHostname($host)
     {
         return preg_match('/^[_a-z]+\.([_a-z]+\.?)+$/i', $host);
     }
-}
+}
diff --git a/tests/JsonSchema/Tests/Constraints/FormatTest.php b/tests/JsonSchema/Tests/Constraints/FormatTest.php
@@ -73,6 +73,7 @@ public function getValidFormats()
             array('23:59:59', 'time'),
 
             array('2000-05-01T12:12:12Z', 'date-time'),
+            array('2000-05-01T12:12:12+01:00', 'date-time'),
 
             array('0', 'utc-millisec'),
 
@@ -127,6 +128,7 @@ public function getInvalidFormats()
             array('25:00:00', 'time'),
 
             array('1999-1-11T00:00:00Z', 'date-time'),
+            array('1999-01-11T00:00:00+1:00', 'date-time'),
 
             array('-1', 'utc-millisec'),
             array(PHP_INT_MAX, 'utc-millisec'),