10BC0 feature #9963 [HttpFoundation] JsonResponse::setEncodingOptions accep… · symfony/symfony@ef12af9 · GitHub
[go: up one dir, main page]
Skip to content

Commit ef12af9

Browse files
fabpotfabpot
committed
feature #9963 [HttpFoundation] JsonResponse::setEncodingOptions accepts also integer (stloyd)
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
2 parents 74fb207 + f8bc3b2 commit ef12af9

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

‎src/Symfony/Component/HttpFoundation/JsonResponse.php‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,18 +117,13 @@ public function getEncodingOptions()
117117
/**
118118
* Sets options used while encoding data to JSON.
119119
*
120-
* @param array $encodingOptions
120+
* @param integer $encodingOptions
121121
*
122122
* @return JsonResponse
123123
*/
124-
public function setEncodingOptions(array $encodingOptions)
124+
public function setEncodingOptions($encodingOptions)
125125
{
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;
132127

133128
return $this->setData(json_decode($this->data));
134129
}

‎src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public function testSetEncodingOptions()
180180

181181
$this->assertEquals('[[1,2,3]]', $response->getContent());
182182

183-
$response->setEncodingOptions(array(JSON_FORCE_OBJECT));
183+
$response->setEncodingOptions(JSON_FORCE_OBJECT);
184184

185185
$this->assertEquals('{"0":{"0":1,"1":2,"2":3}}', $response->getContent());
186186
}

0 commit comments

Comments
 (0)
0