Decoder: fixed datetime regexp [Closes #29]

nette · May 17, 2016 · 4b00342 · 4b00342
1 parent 209868a
commit 4b00342
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/src/Neon/Decoder.php b/src/Neon/Decoder.php
@@ -36,7 +36,7 @@ class Decoder
 		'?:[\t\ ]+', // whitespace
 	);
 
-	const PATTERN_DATETIME = '#\d\d\d\d-\d\d?-\d\d?(?:(?:[Tt]| +)\d\d?:\d\d:\d\d(?:\.\d*)? *(?:Z|[-+]\d\d?(?::\d\d)?)?)?\z#A';
+	const PATTERN_DATETIME = '#\d\d\d\d-\d\d?-\d\d?(?:(?:[Tt]| +)\d\d?:\d\d:\d\d(?:\.\d*)? *(?:Z|[-+]\d\d?(?::?\d\d)?)?)?\z#A';
 
 	const PATTERN_HEX = '#0x[0-9a-fA-F]+\z#A';
 

diff --git a/src/Neon/Encoder.php b/src/Neon/Encoder.php
@@ -24,7 +24,7 @@ class Encoder
 	 */
 	public function encode($var, $options = NULL)
 	{
-		if ($var instanceof \DateTime) {
+		if ($var instanceof \DateTime || $var instanceof \DateTimeImmutable) {
 			return $var->format('Y-m-d H:i:s O');
 
 		} elseif ($var instanceof Entity) {

diff --git a/tests/Neon/Decoder.phpt b/tests/Neon/Decoder.phpt
@@ -235,3 +235,13 @@ foreach (array_merge($dataSet['invalid syntax'], $dataSet['invalid encoding']) a
 		Neon::decode($set[0]);
 	}, 'Nette\Neon\Exception');
 }
+
+// datetime
+Assert::equal(
+	new DateTime('2016-06-03T19:00:00+02:00'),
+	Neon::decode('2016-06-03 19:00:00 +0200')
+);
+Assert::equal(
+	new DateTime('2016-06-03T19:00:00+02:00'),
+	Neon::decode('2016-06-03 19:00:00 +02:00')
+);
diff --git a/tests/Neon/Encoder.phpt b/tests/Neon/Encoder.phpt
@@ -91,3 +91,15 @@ Assert::same(
 	'foo(1, 2)::bar(3)',
 	Neon::encode(Neon::decode('foo(1,2)::bar(3)'))
 );
+
+Assert::same(
+	'2016-06-03 19:00:00 +0200',
+	Neon::encode(new DateTime('2016-06-03T19:00:00+02:00'))
+);
+
+if (PHP_VERSION_ID >= 50500) {
+	Assert::same(
+		'2016-06-03 19:00:00 +0200',
+		Neon::encode(new DateTimeImmutable('2016-06-03T19:00:00+02:00'))
+	);
+}