Encoder: encodes strings with JSON_UNESCAPED_UNICODE | JSON_UNESCAPED…

…_SLASHES
nette · Jan 4, 2015 · 6a0ac32 · 6a0ac32
1 parent 6b2b821
commit 6a0ac32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Neon/Encoder.php b/src/Neon/Encoder.php
@@ -77,7 +77,7 @@ public function encode($var, $options = NULL)
 			return strpos($var, '.') === FALSE ? $var . '.0' : $var;
 
 		} else {
-			return json_encode($var);
+			return json_encode($var, PHP_VERSION_ID >= 50400 ? JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES : 0);
 		}
 	}
 

diff --git a/tests/Neon/Encoder.phpt b/tests/Neon/Encoder.phpt
@@ -72,3 +72,8 @@ Assert::same(
 	'ent()',
 	Neon::encode($entity)
 );
+
+Assert::same(
+	PHP_VERSION_ID >= 50400 ? '",žlu/ťoučký"' : '",\u017elu\/\u0165ou\u010dk\u00fd"',
+	Neon::encode(',žlu/ťoučký')
+);