bug #9917 [HttpFoundation] fixed PHP warnings (fabpot)

fabpot · fabpot · commit df6b0b82825d · 2013-12-31T18:05:00.000+01:00
This PR was merged into the 2.5-dev branch. Discussion ---------- [HttpFoundation] fixed PHP warnings Commits ------- cf71e22 [HttpFoundation] fixed PHP warnings
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -91,7 +91,7 @@ public function setCallback($callback = null)
     public function setData($data = array())
     {
         // Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML.
-        $this->data = json_encode($data, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT);
+        $this->data = @json_encode($data, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT);
 
         if (JSON_ERROR_NONE !== json_last_error()) {
             throw new \InvalidArgumentException($this->transformJsonError());

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function setCallback($callback = null)`
`91`	`91`	`public function setData($data = array())`
`92`	`92`	`{`
`93`	`93`	`// Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML.`
`94`		`- $this->data = json_encode($data, JSON_HEX_TAG \| JSON_HEX_APOS \| JSON_HEX_AMP \| JSON_HEX_QUOT);`
	`94`	`+ $this->data = @json_encode($data, JSON_HEX_TAG \| JSON_HEX_APOS \| JSON_HEX_AMP \| JSON_HEX_QUOT);`
`95`	`95`
`96`	`96`	`if (JSON_ERROR_NONE !== json_last_error()) {`
`97`	`97`	`throw new \InvalidArgumentException($this->transformJsonError());`