feature #9963 [HttpFoundation] JsonResponse::setEncodingOptions accepts also integer (stloyd)

fabpot · fabpot · commit ef12af994814 · 2014-01-07T14:23:52.000+01:00
This PR was merged into the 2.5-dev branch. Discussion ---------- [HttpFoundation] JsonResponse::setEncodingOptions accepts also integer | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Tests pass? | yes | License | MIT Now you can also set encoding options like: ```php $response->setEncodingOptions(JSON_UNESCAPED_UNICODE | $response->getEncodingOptions()); Commits ------- f8bc3b2 [HttpFoundation] JsonResponse::setEncodingOptions accepts also integer
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());
     }

Original file line number	Diff line number	Diff line change
`@@ -117,18 +117,13 @@ public function getEncodingOptions()`
`117`	`117`	`/**`
`118`	`118`	`* Sets options used while encoding data to JSON.`
`119`	`119`	`*`
`120`		`- * @param array $encodingOptions`
	`120`	`+ * @param integer $encodingOptions`
`121`	`121`	`*`
`122`	`122`	`* @return JsonResponse`
`123`	`123`	`*/`
`124`		`- public function setEncodingOptions(array $encodingOptions)`
	`124`	`+ public function setEncodingOptions($encodingOptions)`
`125`	`125`	`{`
`126`		`- $this->encodingOptions = 0;`
`127`		`- foreach ($encodingOptions as $encodingOption) {`
`128`		`- if (($this->encodingOptions & $encodingOption) != $encodingOption) {`
`129`		`- $this->encodingOptions \|= $encodingOption;`
`130`		`- }`
`131`		`- }`
	`126`	`+ $this->encodingOptions = (integer) $encodingOptions;`
`132`	`127`
`133`	`128`	`return $this->setData(json_decode($this->data));`
`134`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public function testSetEncodingOptions()`
`180`	`180`
`181`	`181`	`$this->assertEquals('[[1,2,3]]', $response->getContent());`
`182`	`182`
`183`		`- $response->setEncodingOptions(array(JSON_FORCE_OBJECT));`
	`183`	`+ $response->setEncodingOptions(JSON_FORCE_OBJECT);`
`184`	`184`
`185`	`185`	`$this->assertEquals('{"0":{"0":1,"1":2,"2":3}}', $response->getContent());`
`186`	`186`	`}`