Merge 2496826 into 8ac57d8

library/Zend/Json/Encoder.php

@@ -255,7 +255,9 @@ protected function _encodeString(&$string)
         // 0x08 => \b
         // 0x0c => \f
         $string = str_replace(array(chr(0x08), chr(0x0C)), array('\b', '\f'), $string);
-        $string = self::encodeUnicodeString($string);
+        if (!isset($this->options['unescapedUnicode']) || $this->options['unescapedUnicode'] != true) {
+            $string = self::encodeUnicodeString($string);
+        }
 
         return '"' . $string . '"';
     }

library/Zend/Json/Json.php

@@ -115,6 +115,7 @@ public static function encode($valueToEncode, $cycleCheck = false, $options = ar
         }
 
         $prettyPrint = (isset($options['prettyPrint']) && ($options['prettyPrint'] == true));
+        $unescapedUnicode = (isset($options['unescapedUnicode']) && ($options['unescapedUnicode'] == true));
 
         // Encoding
         if (function_exists('json_encode') && static::$useBuiltinEncoderDecoder !== true) {
@@ -125,10 +126,19 @@ public static function encode($valueToEncode, $cycleCheck = false, $options = ar
                 $prettyPrint = false;
             }
 
+            if ($unescapedUnicode && defined('JSON_UNESCAPED_UNICODE')) {
+                $encodeOptions |= JSON_UNESCAPED_UNICODE;
+                $unescapedUnicode = false;
+            }
+
             $encodedResult = json_encode(
                 $valueToEncode,
                 $encodeOptions
             );
+
+            if ($unescapedUnicode) {
+                $encodedResult = Decoder::decodeUnicodeString($encodedResult);
+            }
         } else {
             $encodedResult = Encoder::encode($valueToEncode, $cycleCheck, $options);
         }

library/Zend/View/Model/JsonModel.php

@@ -63,6 +63,7 @@ public function serialize()
 
         $options = array(
             'prettyPrint' => $this->getOption('prettyPrint'),
+            'unescapedUnicode' => $this->getOption('unescapedUnicode'),
         );
 
         if (null !== $this->jsonpCallback) {

tests/ZendTest/Json/JsonTest.php

@@ -973,6 +973,27 @@ public function testEncodeWithPrettyPrint()
         $this->assertSame($expected, $pretty);
     }
 
+    public function testNativeJSONEncoderWillKeepUnicodeCharactersUnescaped()
+    {
+        $value = array(
+            'héllö wørłd' => true
+        );
+        $expected = '{"héllö wørłd":true}';
+
+        $this->assertEquals($expected, Json\Json::encode($value, false, array('unescapedUnicode' => true)));
+    }
+
+    public function testBuiltinJSONEncoderWillKeepUnicodeCharactersUnescaped()
+    {
+        $value = array(
+            'héllö wørłd' => true
+        );
+        $expected = '{"héllö wørłd":true}';
+
+        Json\Json::$useBuiltinEncoderDecoder = true;
+        $this->assertEquals($expected, Json\Json::encode($value, false, array('unescapedUnicode' => true)));
+    }
+
     /**
      * @group ZF-11167
      */

tests/ZendTest/View/Model/JsonModelTest.php

@@ -51,4 +51,13 @@ public function testPrettyPrint()
         $model = new JsonModel($array, array('prettyPrint' => true));
         $this->assertEquals(Json::encode($array, false, array('prettyPrint' => true)), $model->serialize());
     }
+
+    public function testUnescapedUnicode()
+    {
+        $array = array(
+            'руссиш' => 'руссиш',
+        );
+        $model = new JsonModel($array, array('unescapedUnicode' => true));
+        $this->assertEquals(Json::encode($array, false, array('unescapedUnicode' => true)), $model->serialize());
+    }
 }