diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
index d7144edf56d3..004324bfedea 100644
--- a/src/Symfony/Component/HttpFoundation/JsonResponse.php
+++ b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -117,18 +117,13 @@ public function getEncodingOptions()
/**
* Sets options used while encoding data to JSON.
*
- * @param array $encodingOptions
+ * @param integer $encodingOptions
*
* @return JsonResponse
*/
- public function setEncodingOptions(array $encodingOptions)
+ public function setEncodingOptions($encodingOptions)
{
- $this->encodingOptions = 0;
- foreach ($encodingOptions as $encodingOption) {
- if (($this->encodingOptions & $encodingOption) != $encodingOption) {
- $this->encodingOptions |= $encodingOption;
- }
- }
+ $this->encodingOptions = (integer) $encodingOptions;
return $this->setData(json_decode($this->data));
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
index c027f346417d..c7ea72676de0 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
@@ -180,7 +180,7 @@ public function testSetEncodingOptions()
$this->assertEquals('[[1,2,3]]', $response->getContent());
- $response->setEncodingOptions(array(JSON_FORCE_OBJECT));
+ $response->setEncodingOptions(JSON_FORCE_OBJECT);
$this->assertEquals('{"0":{"0":1,"1":2,"2":3}}', $response->getContent());
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy