dont escape slashes in encoded json, fixes #67

martinlindhe · Nov 26, 2018 · 32dc7f8 · 32dc7f8
1 parent c1f8692
commit 32dc7f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Generator.php b/src/Generator.php
@@ -76,7 +76,7 @@ public function generateFromPath($path, $umd = null, $withVendor = false)
 
         $locales = $this->adjustVendor($locales);
 
-        $jsonLocales = json_encode($locales, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) . PHP_EOL;
+        $jsonLocales = json_encode($locales, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
 
         if(json_last_error() !== JSON_ERROR_NONE)
         {
@@ -136,7 +136,7 @@ public function generateMultiple($path, $umd = null)
         foreach ($this->filesToCreate as $fileName => $data) {
             $fileToCreate = $jsPath . $fileName . '.js';
             $createdFiles .= $fileToCreate . PHP_EOL;
-            $jsonLocales = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) . PHP_EOL;
+            $jsonLocales = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
             if(json_last_error() !== JSON_ERROR_NONE)
             {
                 throw new Exception('Could not generate JSON, error code '.json_last_error());

diff --git a/tests/GenerateTest.php b/tests/GenerateTest.php
@@ -253,6 +253,7 @@ function testShouldNotTouchHtmlTags()
                 'help' => [
                     'yes' => 'see <a href="mailto:mail@com">',
                     'no' => 'see <a href=":link">',
+                    'maybe' => 'It is a <strong>Test</strong> ok!',
                 ]
             ]
         ];
@@ -264,7 +265,8 @@ function testShouldNotTouchHtmlTags()
             . '    "en": {' . PHP_EOL
             . '        "help": {' . PHP_EOL
             . '            "yes": "see <a href=\"mailto:mail@com\">",' . PHP_EOL
-            . '            "no": "see <a href=\"{link}\">"' . PHP_EOL
+            . '            "no": "see <a href=\"{link}\">",' . PHP_EOL
+            . '            "maybe": "It is a <strong>Test</strong> ok!"' . PHP_EOL
             . '        }' . PHP_EOL
             . '    }' . PHP_EOL
             . '}' . PHP_EOL,