[Translation] added option flags to JsonFileDumper.

gepo · gepo · commit fb11aac809c6 · 2015-05-26T01:41:01.000+03:00
It's passed to json_encode function second argument.
diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * deprecated Translator::getMessages(), use TranslatorBagInterface::getCatalogue() instead.
  * added options 'as_tree', 'inline' to YamlFileDumper
+ * added option 'json_encoding' to JsonFileDumper
 
 2.7.0
 -----
diff --git a/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php b/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php
@@ -20,12 +20,26 @@
  */
 class JsonFileDumper extends FileDumper
 {
+    /**
+     * {@inheritdoc}
+     */
+    protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    {
+        $flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;
+
+        if (defined('JSON_PRETTY_PRINT')) {
+            $flags |= JSON_PRETTY_PRINT;
+        }
+
+        return json_encode($messages->all($domain), $flags);
+    }
+
     /**
      * {@inheritdoc}
      */
     public function format(MessageCatalogue $messages, $domain = 'messages')
     {
-        return json_encode($messages->all($domain), defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0);
+        return $this->formatCatalogue($messages, $domain);
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php
@@ -23,11 +23,11 @@ public function testDump()
         }
 
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => 'bar'));
+        $catalogue->add(array('foo' => '"bar"'));
 
         $tempDir = sys_get_temp_dir();
         $dumper = new JsonFileDumper();
-        $dumper->dump($catalogue, array('path' => $tempDir));
+        $dumper->dump($catalogue, array('path' => $tempDir, 'json_encoding' => JSON_HEX_QUOT));
 
         $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resources.json'), file_get_contents($tempDir.'/messages.en.json'));
 
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/resources.json b/src/Symfony/Component/Translation/Tests/fixtures/resources.json
@@ -1,3 +1,3 @@
 {
-    "foo": "bar"
+    "foo": "\u0022bar\u0022"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "foo": "bar"`
	`2`	`+ "foo": "\u0022bar\u0022"`
`3`	`3`	`}`