From 25e0d630b825c5db14a8bf17ac909e50ce09be27 Mon Sep 17 00:00:00 2001 From: Brian Graham Date: Tue, 9 Jun 2015 08:38:12 -0400 Subject: [PATCH] Bug #14836 [HttpFoundation] Moves default JSON encoding assignment from constructor to property --- src/Symfony/Component/HttpFoundation/JsonResponse.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php index fa80c68858..b941b46e84 100644 --- a/src/Symfony/Component/HttpFoundation/JsonResponse.php +++ b/src/Symfony/Component/HttpFoundation/JsonResponse.php @@ -26,7 +26,10 @@ class JsonResponse extends Response { protected $data; protected $callback; - protected $encodingOptions; + + // Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML. + // 15 === JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT + protected $encodingOptions = 15; /** * Constructor. @@ -43,9 +46,6 @@ class JsonResponse extends Response $data = new \ArrayObject(); } - // Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML. - $this->encodingOptions = JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT; - $this->setData($data); }