[HttpFoundation] JsonResponse::setEncodingOptions accepts also integer

Now you can set encoding options like: ``` $response->setEncodingOptions(JSON_UNESCAPED_UNICODE | $response->getEncodingOptions());
symfony · Jan 7, 2014 · f8bc3b2 · f8bc3b2
1 parent 74fb207
commit f8bc3b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git 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
@@ -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());
     }