Merge pull request #910 from Simperfit/hotfix/remove-static-from-foundation-3-1

Simperfit · web-flow · commit 03cb43aa3af3 · 2017-01-15T15:10:32.000+01:00
feat: change JsonResponse::DEFAULT_ENCODING_OPTIONS with real value
diff --git a/src/Serializer/JsonEncoder.php b/src/Serializer/JsonEncoder.php
@@ -34,7 +34,8 @@ public function __construct(string $format, BaseJsonEncoder $jsonEncoder = null)
 
         // Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML.
         $this->jsonEncoder = $jsonEncoder ?: new BaseJsonEncoder(
-            new JsonEncode(JsonResponse::DEFAULT_ENCODING_OPTIONS), new JsonDecode(true)
+        // The value "15" will be replaced by  "JsonResponse::DEFAULT_ENCODING_OPTIONS" when Symfony HttpFoundation 2.7 support will be dropped
+            new JsonEncode(15), new JsonDecode(true)
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ public function __construct(string $format, BaseJsonEncoder $jsonEncoder = null)`
`34`	`34`
`35`	`35`	`// Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML.`
`36`	`36`	`$this->jsonEncoder = $jsonEncoder ?: new BaseJsonEncoder(`
`37`		`- new JsonEncode(JsonResponse::DEFAULT_ENCODING_OPTIONS), new JsonDecode(true)`
	`37`	`+ // The value "15" will be replaced by "JsonResponse::DEFAULT_ENCODING_OPTIONS" when Symfony HttpFoundation 2.7 support will be dropped`
	`38`	`+ new JsonEncode(15), new JsonDecode(true)`
`38`	`39`	`);`
`39`	`40`	`}`
`40`	`41`