Merge branch 'master' of git://github.com/zendframework/zf2 into feat…

…ure/console
zendframework · Jul 12, 2012 · 7e9c7d9 · 7e9c7d9
2 parents b317481 + 66a7225
commit 7e9c7d9
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 33 deletions.
diff --git a/src/Decoder.php b/src/Decoder.php
@@ -462,7 +462,13 @@ public static function decodeUnicodeString($chrs)
                     // single, escaped unicode character
                     $utf16 = chr(hexdec(substr($chrs, ($i + 2), 2)))
                            . chr(hexdec(substr($chrs, ($i + 4), 2)));
-                    $utf8 .= self::_utf162utf8($utf16);
+                    $utf8char = self::_utf162utf8($utf16);
+                    $search  = array('\\', "\n", "\t", "\r", chr(0x08), chr(0x0C), '"', '\'', '/');
+                    if (in_array($utf8char, $search)) {
+                        $replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\\"', '\\\'', '\\/');
+                        $utf8char  = str_replace($search, $replace, $utf8char);
+                    }
+                    $utf8 .= $utf8char;
                     $i += 5;
                     break;
                 case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):

diff --git a/src/Encoder.php b/src/Encoder.php
@@ -248,10 +248,10 @@ protected function _encodeDatum(&$value)
      */
     protected function _encodeString(&$string)
     {
-        // Escape these characters with a backslash:
+        // Escape these characters with a backslash or unicode escape:
         // " \ / \n \r \t \b \f
-        $search  = array('\\', "\n", "\t", "\r", "\b", "\f", '"', '/');
-        $replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\"', '\\/');
+        $search  = array('\\', "\n", "\t", "\r", "\b", "\f", '"', '\'', '&', '<', '>', '/');
+        $replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\\u0022', '\\u0027', '\\u0026',  '\\u003C', '\\u003E', '\\/');
         $string  = str_replace($search, $replace, $string);
 
         // Escape certain ASCII characters:

diff --git a/src/Json.php b/src/Json.php
@@ -118,7 +118,10 @@ public static function encode($valueToEncode, $cycleCheck = false, $options = ar
 
         // Encoding
         if (function_exists('json_encode') && self::$useBuiltinEncoderDecoder !== true) {
-            $encodedResult = json_encode($valueToEncode);
+            $encodedResult = json_encode(
+                $valueToEncode,
+                JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP
+            );
         } else {
             $encodedResult = Encoder::encode($valueToEncode, $cycleCheck, $options);
         }

diff --git a/src/Server/Server.php b/src/Server/Server.php
@@ -256,29 +256,6 @@ public function getResponse()
         return $this->_response;
     }
 
-    /**
-     * Set flag indicating whether or not to auto-emit response
-     *
-     * @param  bool $flag
-     * @return Server
-     * @deprecated Left just for BC, drop it as soon as not used by anyone - use setReturnResponse() with negation instead.
-     */
-    public function setAutoEmitResponse($flag)
-    {
-        return $this->setReturnResponse(!$flag);
-    }
-
-    /**
-     * Will we auto-emit the response?
-     *
-     * @return bool
-     * @deprecated Left just for BC, drop it as soon as not used by anyone - use getReturnResponse() with negation instead.
-     */
-    public function autoEmitResponse()
-    {
-        return !$this->getReturnResponse();
-    }
-
     /**
      * Set return response flag
      *

diff --git a/test/JsonTest.php b/test/JsonTest.php
@@ -147,13 +147,48 @@ public function testString4()
      */
     public function testString5()
     {
-        $expected = '"INFO: Path \"Some more\""';
+        $expected = '"INFO: Path \\u0022Some more\\u0022"';
         $string   = 'INFO: Path "Some more"';
         $encoded  = Json\Encoder::encode($string);
-        $this->assertEquals($expected, $encoded, 'Quote encoding incorrect: expected ' . serialize($expected) . '; received: ' . serialize($encoded) . "\n");
+        $this->assertEquals(
+            $expected,
+            $encoded,
+            'Quote encoding incorrect: expected ' . serialize($expected) . '; received: ' . serialize($encoded) . "\n"
+        );
+        $this->assertEquals($string, Json\Decoder::decode($encoded)); // Bug: does not accept \u0022 as token!
+    }
+
+    /**
+     * Test decoding of unicode escaped special characters
+     */
+    public function testStringOfHtmlSpecialCharsEncodedToUnicodeEscapes()
+    {
+        Json\Json::$useBuiltinEncoderDecoder = false;
+        $expected = '"\\u003C\\u003E\\u0026\\u0027\\u0022"';
+        $string   = '<>&\'"';
+        $encoded  = Json\Encoder::encode($string);
+        $this->assertEquals(
+            $expected,
+            $encoded,
+            'Encoding error: expected ' . serialize($expected) . '; received: ' . serialize($encoded) . "\n"
+        );
+        $this->assertEquals($string, Json\Decoder::decode($encoded));
+    }
+
+    /**
+     * Test decoding of unicode escaped ASCII (non-HTML special) characters
+     *
+     * Note: covers chars that MUST be escaped. Does not test any other non-printables.
+     */
+    public function testStringOfOtherSpecialCharsEncodedToUnicodeEscapes()
+    {
+        Json\Json::$useBuiltinEncoderDecoder = false;
+        $string   = "\\ - \n - \t - \r - " .chr(0x08). " - " .chr(0x0C). " - / - \v";
+        $encoded  = '"\u005C - \u000A - \u0009 - \u000D - \u0008 - \u000C - \u002F - \u000B"';
         $this->assertEquals($string, Json\Decoder::decode($encoded));
     }
 
+
     /**
      * test indexed array encoding/decoding
      */
@@ -704,7 +739,17 @@ public function testEncodeObjectImplementingIterator()
     public function testNativeJSONEncoderWillProperlyEncodeSolidusInStringValues()
     {
         $source = "</foo><foo>bar</foo>";
-        $target = '"<\\/foo><foo>bar<\\/foo>"';
+        $target = '"\u003C\/foo\u003E\u003Cfoo\u003Ebar\u003C\/foo\u003E"';
+
+        // first test ext/json
+        Json\Json::$useBuiltinEncoderDecoder = false;
+        $this->assertEquals($target, Json\Json::encode($source));
+    }
+
+    public function testNativeJSONEncoderWillProperlyEncodeHtmlSpecialCharsInStringValues()
+    {
+        $source = "<>&'\"";
+        $target = '"\u003C\u003E\u0026\u0027\u0022"';
 
         // first test ext/json
         Json\Json::$useBuiltinEncoderDecoder = false;
@@ -717,7 +762,17 @@ public function testNativeJSONEncoderWillProperlyEncodeSolidusInStringValues()
     public function testBuiltinJSONEncoderWillProperlyEncodeSolidusInStringValues()
     {
         $source = "</foo><foo>bar</foo>";
-        $target = '"<\\/foo><foo>bar<\\/foo>"';
+        $target = '"\u003C\/foo\u003E\u003Cfoo\u003Ebar\u003C\/foo\u003E"';
+
+        // first test ext/json
+        Json\Json::$useBuiltinEncoderDecoder = true;
+        $this->assertEquals($target, Json\Json::encode($source));
+    }
+
+    public function testBuiltinJSONEncoderWillProperlyEncodeHtmlSpecialCharsInStringValues()
+    {
+        $source = "<>&'\"";
+        $target = '"\u003C\u003E\u0026\u0027\u0022"';
 
         // first test ext/json
         Json\Json::$useBuiltinEncoderDecoder = true;
@@ -782,7 +837,7 @@ public function testJsonPrettyPrintWorksWithArrayNotationInStringLiteral()
         $expected = <<<EOB
 {
  "simple":"simple test string",
- "stringwithjsonchars":"\\\\\\"[1,2]",
+ "stringwithjsonchars":"\\\\\\u0022[1,2]",
  "complex":{
   "foo":"bar",
   "far":"boo",

diff --git a/test/JsonXmlTest.php b/test/JsonXmlTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Json;
+
 use Zend\Json;
 
 error_reporting( E_ALL | E_STRICT ); // now required for each test suite

diff --git a/test/Server/CacheTest.php b/test/Server/CacheTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Json\Server;
+
 use Zend\Json\Server;
 
 /**

diff --git a/test/Server/ErrorTest.php b/test/Server/ErrorTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Json\Server;
+
 use Zend\Json\Server;
 use Zend\Json;
 

diff --git a/test/Server/RequestTest.php b/test/Server/RequestTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Json\Server;
+
 use Zend\Json;
 
 /**

diff --git a/test/Server/ResponseTest.php b/test/Server/ResponseTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Json\Server;
+
 use Zend\Json\Server;
 use Zend\Json;
 

diff --git a/test/Server/Smd/ServiceTest.php b/test/Server/Smd/ServiceTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Json\Server\Smd;
+
 use Zend\Json\Server\Smd\Service;
 use Zend\Json\Server;
 

diff --git a/test/Server/SmdTest.php b/test/Server/SmdTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Json\Server;
+
 use Zend\Json\Server\Smd;
 use Zend\Json\Server;
 use Zend\Json\Server\Exception\InvalidArgumentException;

diff --git a/test/ServerTest.php b/test/ServerTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Json;
+
 use Zend\Json\Server;
 use Zend\Json;
 use Zend\Json\Server\Request;